From e0b79ed09ebb006006eb10f0513b072568059f00 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Mon, 4 Jul 2005 19:20:02 +0000
Subject: [PATCH] Fix line lengths and other formatting issues.

---
 docs/Samba3-ByExample/SBE-2000UserNetwork.xml  | 20 ++++++++++----------
 docs/Samba3-ByExample/SBE-MakingHappyUsers.xml |  7 +++----
 docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml |  7 ++++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index 658a0f42d09..fcf244ab8ac 100644
--- a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
@@ -628,16 +628,6 @@ productivity.</para>
 	inconsistent directory information can be exceedingly difficult.
 	</para>
 
-	<figure id="chap7net">
-		<title>Network Topology &smbmdash; 2000 User Complex Design A</title>
-		<imagefile scale="70">chap7-net-Ar</imagefile>
-	</figure>
-
-	<figure id="chap7net2">
-		<title>Network Topology &smbmdash; 2000 User Complex Design B</title>
-		<imagefile scale="70">chap7-net2-Br</imagefile>
-	</figure>
-
 	</sect3>
 
 	</sect2>
@@ -1308,6 +1298,16 @@ index default               sub
 
 	</sect2>
 
+	<figure id="chap7net">
+		<title>Network Topology &smbmdash; 2000 User Complex Design A</title>
+		<imagefile scale="80">chap7-net-Ar</imagefile>
+	</figure>
+
+	<figure id="chap7net2">
+		<title>Network Topology &smbmdash; 2000 User Complex Design B</title>
+		<imagefile scale="80">chap7-net2-Br</imagefile>
+	</figure>
+
 </sect1>
 
 <sect1>
diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
index 514e2adbbf4..3771e23d182 100644
--- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -1086,9 +1086,9 @@ nss_base_passwd dc=abmas,dc=biz?sub
 
 			<para>
 			<itemizedlist>
-			<listitem><para>User accounts are stored under the DIT: ou=Users,dc=abmas,dc=biz</para></listitem>
-			<listitem><para>User login accounts are under the DIT: ou=People,ou-Users,dc=abmas,dc=biz</para></listitem>
-			<listitem><para>Computer accounts are under the DIT: ou=Computers,ou=Users,dc=abmas,dc=biz</para></listitem>
+			<listitem><para>User accounts are stored under the DIT: ou=Users, dc=abmas, dc=biz</para></listitem>
+			<listitem><para>User login accounts are under the DIT: ou=People, ou-Users, dc=abmas, dc=biz</para></listitem>
+			<listitem><para>Computer accounts are under the DIT: ou=Computers, ou=Users, dc=abmas, dc=biz</para></listitem>
 			</itemizedlist>
 			</para>
 
@@ -2110,7 +2110,6 @@ my $smbldap_bind_conf="/etc/smbldap-tools/smbldap_bind.conf";
 		The interactive use of this script for the PDC is demonstrated here:
 <screen>
 &rootprompt; /opt/IDEALX/sbin/configure.pl 
-merlin:/opt/IDEALX/sbin # ./configure.pl 
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
        smbldap-tools script configuration
        -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
index 215eb1810cb..e16095c3e38 100644
--- a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
@@ -484,7 +484,8 @@ ou=groups,dc=abmas,dc=biz"
 write
   by * read
 
-## This is used to quickly deactivate any LDAP object only Admins have access.
+## This is used to quickly deactivate any LDAP object only 
+##  Admins have access.
 access to dn.sub="ou=inactive,dc=abmas,dc=biz"
   by * none
 
@@ -1664,8 +1665,8 @@ ENDIF
 
 		<step><para>
 			In the next dialog, copy it directly to the profiles share on the
-			Samba server (\\PDCname\profiles\user\&lt;architecture&gt; in my
-			case). You will have had to make a connection to the share as that
+			Samba server (in my case \\PDCname\profiles\user\&lt;architecture&gt;.
+			You will have had to make a connection to the share as that
 			user (e.g., Windows Explorer type \\PDCname\profiles\username).
 		</para></step>
 
-- 
2.11.4.GIT