From d5bb12a0237e8a30a4fd84def9a04fc1452b9ae3 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 17 Aug 2005 15:45:35 +0000
Subject: [PATCH] one more round of clarifications (This used to be commit
 d33574fdb499f89ec83e9e14979174c6c4d5e68a)

---
 docs/smbdotconf/ldap/ldapgroupsuffix.xml   | 3 +--
 docs/smbdotconf/ldap/ldapidmapsuffix.xml   | 3 +--
 docs/smbdotconf/ldap/ldapmachinesuffix.xml | 3 +--
 docs/smbdotconf/ldap/ldapsuffix.xml        | 6 ++----
 docs/smbdotconf/ldap/ldapusersuffix.xml    | 3 +--
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
index dfe8d33a296..8e46aff0031 100644
--- a/docs/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -8,8 +8,7 @@
 	used for groups when these are added to the LDAP directory.
 	If this parameter is unset, the value of <smbconfoption 
 	name="ldap suffix"/> will be used instead.  The suffix string is pre-pended to the
-        <smbconfoption name="ldap suffix"/> string so use a partial DN
-         unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para>
+        <smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
 
 </description>
 <value type="default"></value>
diff --git a/docs/smbdotconf/ldap/ldapidmapsuffix.xml b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
index 553b9b5534b..f3bbc10adec 100644
--- a/docs/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -8,8 +8,7 @@
 	used when storing idmap mappings. If this parameter 
 	is unset, the value of <smbconfoption name="ldap suffix"/>
 	will be used instead.  The suffix string is pre-pended to the
-	<smbconfoption name="ldap suffix"/> string so use a partial DN
-	 unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para>
+	<smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
 </description>
 <value type="default"></value>
 <value type="example">ou=Idmap</value>
diff --git a/docs/smbdotconf/ldap/ldapmachinesuffix.xml b/docs/smbdotconf/ldap/ldapmachinesuffix.xml
index ae82cba3f50..74fab93eca1 100644
--- a/docs/smbdotconf/ldap/ldapmachinesuffix.xml
+++ b/docs/smbdotconf/ldap/ldapmachinesuffix.xml
@@ -7,8 +7,7 @@
 	<para>It specifies where machines should be added to the ldap tree.
         If this parameter is unset, the value of <smbconfoption
         name="ldap suffix"/> will be used instead.  The suffix string is pre-pended to the
-        <smbconfoption name="ldap suffix"/> string so use a partial DN
-        unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para>
+        <smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
 </description>
 
 <value type="default"></value>
diff --git a/docs/smbdotconf/ldap/ldapsuffix.xml b/docs/smbdotconf/ldap/ldapsuffix.xml
index 819d0ef6067..cc67392b06d 100644
--- a/docs/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapsuffix.xml
@@ -4,10 +4,8 @@
 		 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>Specifies where user and machine accounts are added to the
-	tree. Can be overriden by <smbconfoption name="ldap user suffix"/> and 
-	<smbconfoption name="ldap machine suffix"/>. It also used as the base dn for all ldap
-	searches. </para>
+	<para>Specifies the base for all ldap suffixes and for 
+	storing the sambaDomain object.</para>
 </description>
 <value type="default"></value>
 <value type="example">dc=samba,dc=org</value>
diff --git a/docs/smbdotconf/ldap/ldapusersuffix.xml b/docs/smbdotconf/ldap/ldapusersuffix.xml
index 437c45ddccc..b97cd07094c 100644
--- a/docs/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs/smbdotconf/ldap/ldapusersuffix.xml
@@ -7,8 +7,7 @@
 	<para>This parameter specifies where users are added to the tree. 
         If this parameter is unset, the value of <smbconfoption
         name="ldap suffix"/> will be used instead.  The suffix string is pre-pended to the
-        <smbconfoption name="ldap suffix"/> string so use a partial DN
-        unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para>
+        <smbconfoption name="ldap suffix"/> string so use a partial DN.</para>
 
 </description>
 <value type="default"/>
-- 
2.47.3