summaryrefslogtreecommitdiff
path: root/docs/Samba3-ByExample
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-07-04 19:20:02 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:59 -0500
commit72ceea2f488c3b29fca0bd5d21dcf4d22f4a6764 (patch)
treec805917961e2b6e505360b7f7f15286e4d626e78 /docs/Samba3-ByExample
parent4175014b1a8a72b8223645064c759a4b1c6e7b4e (diff)
downloadsamba-72ceea2f488c3b29fca0bd5d21dcf4d22f4a6764.tar.gz
samba-72ceea2f488c3b29fca0bd5d21dcf4d22f4a6764.tar.bz2
samba-72ceea2f488c3b29fca0bd5d21dcf4d22f4a6764.zip
Fix line lengths and other formatting issues.
(This used to be commit f1c42e8a683c218053d4f58bca813814429ab065)
Diffstat (limited to 'docs/Samba3-ByExample')
-rw-r--r--docs/Samba3-ByExample/SBE-2000UserNetwork.xml20
-rw-r--r--docs/Samba3-ByExample/SBE-MakingHappyUsers.xml7
-rw-r--r--docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml7
3 files changed, 17 insertions, 17 deletions
diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index 658a0f42d0..fcf244ab8a 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 514e2adbbf..3771e23d18 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 215eb1810c..e16095c3e3 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>