Another layout fixes update.

(This used to be commit 8001063cb3129793cd1d4bf088e4936b734f7599)

4 files changed, 11 insertions, 10 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-PAM.xml b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
index 024a2f3ef8..dd9197d96a 100644
--- a/docs/Samba3-HOWTO/TOSHARG-PAM.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
@@ -324,7 +324,7 @@ Once we have explained the meaning of the tokens, we describe this method.
 <indexterm><primary>password</primary></indexterm>
 			<parameter>password:</parameter> This last module type is required for updating the authentication
 			token associated with the user. Typically, there is one module for each
-			<quote>challenge/response</quote>-based authentication <parameter>(auth)</parameter> module type.
+			<quote>challenge/response</quote> authentication <parameter>(auth)</parameter> module type.
 			</para></listitem>
 		</itemizedlist>
 		</listitem>
@@ -482,7 +482,7 @@ Once we have explained the meaning of the tokens, we describe this method.
 			</para></listitem>
 
 			<listitem><para>
-			<parameter>sufficient</parameter> is equivalent to <parameter>[success=done new_authtok_reqd=done default=ignore]</parameter>.
+			<parameter>sufficient</parameter> is equivalent to <parameter>[success=done  new_authtok_reqd=done  default=ignore]</parameter>.
 			</para></listitem>
 
 			<listitem><para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 5f5f595d05..0341f2ef0d 100644
--- a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -570,7 +570,7 @@ and Windows 2003.
 </para>
 
 <para>
-The UPHClean software package can be downloaded from <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en">User Profile Hive Cleanup Service.</ulink>
+The UPHClean software package can be downloaded from <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID= 1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en">User Profile Hive Cleanup Service.</ulink>
 </para>
 
 </sect2>
diff --git a/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml b/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml
index 6a3aa33bba..311817a810 100644
--- a/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-SecureLDAP.xml
@@ -276,7 +276,8 @@ Signed certificate is in newcert.pem
 &rootprompt; cp newcert.pem /etc/openldap/servercrt.pem
 &rootprompt; cp newreq.pem /etc/openldap/serverkey.pem
 &rootprompt; chown ldap.ldap /etc/openldap/*.pem
-&rootprompt; chmod 640 /etc/openldap/cacert.pem; chmod 600 /etc/openldap/serverkey.pem
+&rootprompt; chmod 640 /etc/openldap/cacert.pem;
+&rootprompt; chmod 600 /etc/openldap/serverkey.pem
 </computeroutput>
 </screen>
 	</para>
@@ -329,7 +330,8 @@ Starting slapd:                                            [  OK  ]
 	<option>-ZZ</option><footnote><para>See <command>man ldapsearch</command></para></footnote> option:
 <screen width="90">
 <computeroutput>
-&rootprompt; ldapsearch -x -b "dc=ldap,dc=abmas,dc=biz" -H 'ldap://ldap.abmas.biz:389' -ZZ
+&rootprompt; ldapsearch -x -b "dc=ldap,dc=abmas,dc=biz" \
+        -H 'ldap://ldap.abmas.biz:389' -ZZ
 </computeroutput>
 </screen>
 	Your results should be the same as before you restarted the server, for example:
diff --git a/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
index d1e601ff50..ab328eda0b 100644
--- a/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
@@ -435,11 +435,10 @@ complete descriptions of new or modified parameters.
 <indexterm><primary>Windows domain</primary></indexterm>
 <indexterm><primary>getpwnam() call</primary></indexterm>
 <indexterm><primary>NT_STATUS_LOGON_FAILURE</primary></indexterm>
-		When operating as a member of a Windows domain, Samba-2.2 would
-		map any users authenticated by the remote DC to the <quote>guest account</quote>
-		if a UID could not be obtained via the getpwnam() call. Samba-3
-		rejects the connection as NT_STATUS_LOGON_FAILURE. There is no
-		current workaround to re-establish the Samba-2.2 behavior.
+		When operating as a member of a Windows domain, Samba-2.2 would map any users authenticated by the remote DC
+		to the <quote>guest account</quote> if a UID could not be obtained via the getpwnam() call. Samba-3 rejects
+		the connection with the error message <quote>NT_STATUS_LOGON_FAILURE.</quote> There is no current workaround
+		to re-establish the Samba-2.2 behavior.
 		</para></listitem>
 
 		<listitem><para>