Fix line lengths and other formatting issues.

(This used to be commit f1c42e8a683c218053d4f58bca813814429ab065)

diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index 658a0f42d09aafad6674549a6f36dc467e773bad..fcf244ab8ac07b645730bc0ea3d53e98c258f8f9 100644 (file)
--- 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 514e2adbbf41678f2bcac3defec04f652152ed04..3771e23d18220bea0a672d56cc0f1dbf5f26f88d 100644 (file)
--- 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 215eb1810cb2a0f8a7175da9d3988fdb669c6a9e..e16095c3e380c9b4838c08bf4a3fd42092bc74a6 100644 (file)
--- 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>