one more round of clarifications

diff --git a/docs/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
index dfe8d33a296f9f7e6c477562fe152f809c83c31a..8e46aff003117d5758b3567e9338c0f4c01cc8a1 100644 (file)
--- 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 553b9b5534b80e227a2a7bf5437e8f1ab003d9ad..f3bbc10adec9c50e4042994952f020869b794d04 100644 (file)
--- 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 ae82cba3f5095b2b8e82c824e30beff78352e026..74fab93eca1f12df24a20ce968efd1821c4cf187 100644 (file)
--- 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 819d0ef606712b9014dedc8ede1561d7a01ce109..cc67392b06d9c87d5a50c5fc5d9bee133333eead 100644 (file)
--- 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 437c45ddccc49250ce3c61ccd2f1c3f1af3d59a8..b97cd07094c129e0e3d8e8650efde7ff1efb47eb 100644 (file)
--- 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"/>