Blame 0001-man-move-note-to-the-right-section.patch

c31b6fe
From d2d3879bdfcea70757a8b0527882e79e8b5c6e70 Mon Sep 17 00:00:00 2001
aeef261
From: Sumit Bose <sbose@redhat.com>
c31b6fe
Date: Wed, 27 Nov 2019 18:26:44 +0100
c31b6fe
Subject: [PATCH 1/6] man: move note to the right section
c31b6fe
c31b6fe
Unfortunately the note about the password lifetime was added to the join
c31b6fe
section. This patch move it to the update section where it belongs to.
aeef261
aeef261
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1738573
c31b6fe
           https://bugzilla.redhat.com/show_bug.cgi?id=1745931
c31b6fe
           https://bugzilla.redhat.com/show_bug.cgi?id=1774622
c31b6fe
---
c31b6fe
 doc/adcli.xml | 12 ++++++------
c31b6fe
 1 file changed, 6 insertions(+), 6 deletions(-)
aeef261
aeef261
diff --git a/doc/adcli.xml b/doc/adcli.xml
c31b6fe
index 4f201e0..9faf96a 100644
aeef261
--- a/doc/adcli.xml
aeef261
+++ b/doc/adcli.xml
c31b6fe
@@ -330,11 +330,7 @@ Password for Administrator:
c31b6fe
 			important here is currently the
c31b6fe
 			<option>workgroup</option> option, see
c31b6fe
 			<citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
c31b6fe
-			for details.</para>
c31b6fe
-			<para>Note that if the machine account password is not
c31b6fe
-			older than 30 days, you have to pass
c31b6fe
-			<option>--computer-password-lifetime=0</option> to
c31b6fe
-			force the update.</para></listitem>
c31b6fe
+			for details.</para></listitem>
c31b6fe
 		</varlistentry>
c31b6fe
 		<varlistentry>
c31b6fe
 			<term><option>--samba-data-tool=<parameter>/path/to/net</parameter></option></term>
c31b6fe
@@ -472,7 +468,11 @@ $ adcli update --login-ccache=/tmp/krbcc_123
aeef261
 			important here is currently the
aeef261
 			<option>workgroup</option> option, see
aeef261
 			<citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
aeef261
-			for details.</para></listitem>
aeef261
+			for details.</para>
aeef261
+			<para>Note that if the machine account password is not
aeef261
+			older than 30 days, you have to pass
aeef261
+			<option>--computer-password-lifetime=0</option> to
aeef261
+			force the update.</para></listitem>
aeef261
 		</varlistentry>
aeef261
 		<varlistentry>
aeef261
 			<term><option>--samba-data-tool=<parameter>/path/to/net</parameter></option></term>
aeef261
-- 
c31b6fe
2.25.1
aeef261