Further clarification regarding ldap suffix usage.

diff --git a/docs/smbdotconf/ldap/ldapadmindn.xml b/docs/smbdotconf/ldap/ldapadmindn.xml
index 5f8805ad144eef18e73c5227c4933b0c419e5903..442d242679ddbfaa02fe1f2b3dc4085d02627eb3 100644 (file)
--- a/docs/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs/smbdotconf/ldap/ldapadmindn.xml
@@ -4,13 +4,18 @@
                                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
                                 <description>
-                                        <para> The <smbconfoption name="ldap admin dn"/>
-       defines the Distinguished  Name (DN) name used by Samba to
-       contact the ldap server when retreiving  user account
-       information. The <smbconfoption name="ldap admin dn"/> is used in conjunction with the admin dn password
-       stored in the <filename moreinfo="none">private/secrets.tdb</filename> file.
-       See the <citerefentry><refentrytitle>smbpasswd</refentrytitle>
-       <manvolnum>8</manvolnum></citerefentry> man page for more
-       information on how  to accmplish this.</para>
+
+        <para>
+       The <smbconfoption name="ldap admin dn"/> defines the Distinguished  Name (DN) name used by Samba to contact
+       the ldap server when retreiving  user account information. The <smbconfoption name="ldap admin dn"/> is used
+       in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename>
+       file.  See the <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>
+       man page for more information on how  to accomplish this.
+       </para>
+
+       <para>
+       The <smbconfoption name="ldap admin dn"/> requires a fully specified DN. The <smbconfoption name="ldap
+       suffix"/> is not appended to the <smbconfoption name="ldap admin dn"/>.
+       </para>
 </description>
 </samba:parameter>

diff --git a/docs/smbdotconf/ldap/ldappasswdsync.xml b/docs/smbdotconf/ldap/ldappasswdsync.xml
index 3a6b45654fb3fbd811d6e2de937e6bbe9330cf58..167c206b97502fb09084ace1c0330b81ac70841c 100644 (file)
--- a/docs/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs/smbdotconf/ldap/ldappasswdsync.xml
@@ -4,10 +4,9 @@
                                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>This option is used to define whether
-       or not Samba should sync the LDAP password with the NT
-       and LM hashes for normal accounts (NOT for
-       workstation, server or domain trusts) on a password
+       <para>
+       This option is used to define whether or not Samba should sync the LDAP password with the NT
+       and LM hashes for normal accounts (NOT for workstation, server or domain trusts) on a password
        change via SAMBA.  
        </para>
 

diff --git a/docs/smbdotconf/ldap/ldapsuffix.xml b/docs/smbdotconf/ldap/ldapsuffix.xml
index cc67392b06d9c87d5a50c5fc5d9bee133333eead..47d5a5bba2d26de8ffb6c18a81ed4d27430ea09d 100644 (file)
--- a/docs/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapsuffix.xml
@@ -4,8 +4,14 @@
                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>Specifies the base for all ldap suffixes and for 
-       storing the sambaDomain object.</para>
+       <para>Specifies the base for all ldap suffixes and for storing the sambaDomain object.</para>
+
+       <para>
+       The ldap suffix will be appended to the values specified for the <smbconfoption name="ldap user suffix"/>,
+       <smbconfoption name="ldap group suffix"/>, <smbconfoption name="ldap machine suffix"/>, and the
+       <smbconfoption name="ldap idmap suffix"/>. Each of these should be given only a DN relative to the
+       <smbconfoption name ="ldap suffix"/>.
+       </para>
 </description>
 <value type="default"></value>
 <value type="example">dc=samba,dc=org</value>