From 46da9877db6ec59d5f71c1af01c8a7eb7dab6356 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Wed, 17 Aug 2005 16:24:08 +0000
Subject: Further clarification regarding ldap suffix usage. (This used to be
 commit 4510dccd6ecf8c562be752fb8961901b607fdeb1)

---
 docs/smbdotconf/ldap/ldapadmindn.xml    | 21 +++++++++++++--------
 docs/smbdotconf/ldap/ldappasswdsync.xml |  7 +++----
 docs/smbdotconf/ldap/ldapsuffix.xml     | 10 ++++++++--
 3 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'docs/smbdotconf')

diff --git a/docs/smbdotconf/ldap/ldapadmindn.xml b/docs/smbdotconf/ldap/ldapadmindn.xml
index 5f8805ad14..442d242679 100644
--- 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 3a6b45654f..167c206b97 100644
--- 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 cc67392b06..47d5a5bba2 100644
--- 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>
-- 
cgit