summaryrefslogtreecommitdiff
path: root/docs/smbdotconf/ldap
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-08-17 15:45:35 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:05 -0500
commitd5bb12a0237e8a30a4fd84def9a04fc1452b9ae3 (patch)
tree4e24da76554ff35a289cb29beaddd610f40ed31a /docs/smbdotconf/ldap
parente0dfc4ecedff9bd7361ab7b975d96df3b2cc2667 (diff)
downloadsamba-d5bb12a0237e8a30a4fd84def9a04fc1452b9ae3.tar.gz
samba-d5bb12a0237e8a30a4fd84def9a04fc1452b9ae3.tar.bz2
samba-d5bb12a0237e8a30a4fd84def9a04fc1452b9ae3.zip
one more round of clarifications
(This used to be commit d33574fdb499f89ec83e9e14979174c6c4d5e68a)
Diffstat (limited to 'docs/smbdotconf/ldap')
-rw-r--r--docs/smbdotconf/ldap/ldapgroupsuffix.xml3
-rw-r--r--docs/smbdotconf/ldap/ldapidmapsuffix.xml3
-rw-r--r--docs/smbdotconf/ldap/ldapmachinesuffix.xml3
-rw-r--r--docs/smbdotconf/ldap/ldapsuffix.xml6
-rw-r--r--docs/smbdotconf/ldap/ldapusersuffix.xml3
5 files changed, 6 insertions, 12 deletions
diff --git a/docs/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/smbdotconf/ldap/ldapgroupsuffix.xml
index dfe8d33a29..8e46aff003 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 553b9b5534..f3bbc10ade 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 ae82cba3f5..74fab93eca 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 819d0ef606..cc67392b06 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 437c45ddcc..b97cd07094 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"/>