clarifying ldap suffix options

(This used to be commit 30248d33d1eac0d77c2e2a82497869fec3795bf5)

5 files changed, 27 insertions, 12 deletions

diff --git a/docs/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
index ffbebe2f5c..dfe8d33a29 100644
--- a/docs/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -6,9 +6,12 @@
 <description>
 	<para>This parameters specifies the suffix that is 
 	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.</para>
+	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>
 
 </description>
 <value type="default"></value>
-<value type="example">ou=Groups,dc=samba,ou=Groups</value>
+<value type="example">ou=Groups</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldapidmapsuffix.xml b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
index 81fc98d8b9..553b9b5534 100644
--- a/docs/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -7,8 +7,10 @@
 	<para>This parameters specifies the suffix that is 
 	used when storing idmap mappings. If this parameter 
 	is unset, the value of <smbconfoption name="ldap suffix"/>
-	will be used instead.</para>
+	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>
 </description>
 <value type="default"></value>
-<value type="example">ou=Idmap,dc=samba,dc=org</value>
+<value type="example">ou=Idmap</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldapmachinesuffix.xml b/docs/smbdotconf/ldap/ldapmachinesuffix.xml
index 994345fb1b..ae82cba3f5 100644
--- a/docs/smbdotconf/ldap/ldapmachinesuffix.xml
+++ b/docs/smbdotconf/ldap/ldapmachinesuffix.xml
@@ -4,8 +4,13 @@
 		 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>It specifies where machines should be added to the ldap tree.</para>
+	<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>
 </description>
 
 <value type="default"></value>
+<value type="example">ou=Computers</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldapsuffix.xml b/docs/smbdotconf/ldap/ldapsuffix.xml
index 233c61040c..819d0ef606 100644
--- a/docs/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs/smbdotconf/ldap/ldapsuffix.xml
@@ -1,13 +1,14 @@
 <samba:parameter name="ldap suffix"
                  context="G"
-				 type="string"
+		 type="string"
 		 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>
+	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>
 </description>
 <value type="default"></value>
+<value type="example">dc=samba,dc=org</value>
 </samba:parameter>
diff --git a/docs/smbdotconf/ldap/ldapusersuffix.xml b/docs/smbdotconf/ldap/ldapusersuffix.xml
index d860fba0da..437c45ddcc 100644
--- a/docs/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs/smbdotconf/ldap/ldapusersuffix.xml
@@ -1,12 +1,16 @@
 <samba:parameter name="ldap user suffix"
 	context="G"
 	type="string"
-		 advanced="1" developer="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+	advanced="1" developer="1"
+        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies where users are added to the tree. 
-		If this parameter is not specified, the value from <smbconfoption name="ldap suffix"/>.</para>
+        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>
 
 </description>
 <value type="default"/>
+<value type="example">ou=people</value>
 </samba:parameter>