diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-07-04 21:36:46 +0000 |
---|---|---|
committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:00 -0500 |
commit | 55d8ee039a920508fb51bcc85397e26acc365f60 (patch) | |
tree | 77c323ae9e51c71202c8c4af948fc5e2082c778f /docs/smbdotconf/ldap | |
parent | b5f9c625fe26329edf19537939609c3e039e98e6 (diff) | |
download | samba-55d8ee039a920508fb51bcc85397e26acc365f60.tar.gz samba-55d8ee039a920508fb51bcc85397e26acc365f60.tar.bz2 samba-55d8ee039a920508fb51bcc85397e26acc365f60.zip |
Some random updates.
(This used to be commit 57d0cc9fcdc1c790a601f6dcf7071188448a5f58)
Diffstat (limited to 'docs/smbdotconf/ldap')
-rw-r--r-- | docs/smbdotconf/ldap/ldapadmindn.xml | 5 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapgroupsuffix.xml | 2 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapidmapsuffix.xml | 2 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldappasswdsync.xml | 3 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapport.xml | 2 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapssl.xml | 5 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapsuffix.xml | 5 | ||||
-rw-r--r-- | docs/smbdotconf/ldap/ldapusersuffix.xml | 2 |
8 files changed, 11 insertions, 15 deletions
diff --git a/docs/smbdotconf/ldap/ldapadmindn.xml b/docs/smbdotconf/ldap/ldapadmindn.xml index 4e6c30c141..5f8805ad14 100644 --- a/docs/smbdotconf/ldap/ldapadmindn.xml +++ b/docs/smbdotconf/ldap/ldapadmindn.xml @@ -4,11 +4,10 @@ type="string" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para> The <parameter moreinfo="none">ldap admin dn</parameter> + <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 <parameter moreinfo="none">ldap admin - dn</parameter> is used in conjunction with the admin dn password + 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 diff --git a/docs/smbdotconf/ldap/ldapgroupsuffix.xml b/docs/smbdotconf/ldap/ldapgroupsuffix.xml index 00d6fba7a0..ffbebe2f5c 100644 --- a/docs/smbdotconf/ldap/ldapgroupsuffix.xml +++ b/docs/smbdotconf/ldap/ldapgroupsuffix.xml @@ -6,7 +6,7 @@ <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 <parameter>ldap suffix</parameter> will be used instead.</para> + If this parameter is unset, the value of <smbconfoption name="ldap suffix"/> will be used instead.</para> </description> <value type="default"></value> diff --git a/docs/smbdotconf/ldap/ldapidmapsuffix.xml b/docs/smbdotconf/ldap/ldapidmapsuffix.xml index 1557175dd6..81fc98d8b9 100644 --- a/docs/smbdotconf/ldap/ldapidmapsuffix.xml +++ b/docs/smbdotconf/ldap/ldapidmapsuffix.xml @@ -6,7 +6,7 @@ <description> <para>This parameters specifies the suffix that is used when storing idmap mappings. If this parameter - is unset, the value of <parameter>ldap suffix</parameter> + is unset, the value of <smbconfoption name="ldap suffix"/> will be used instead.</para> </description> <value type="default"></value> diff --git a/docs/smbdotconf/ldap/ldappasswdsync.xml b/docs/smbdotconf/ldap/ldappasswdsync.xml index f215da5bff..3a6b45654f 100644 --- a/docs/smbdotconf/ldap/ldappasswdsync.xml +++ b/docs/smbdotconf/ldap/ldappasswdsync.xml @@ -11,8 +11,7 @@ change via SAMBA. </para> - <para>The <parameter moreinfo="none">ldap passwd - sync</parameter> can be set to one of three values: </para> + <para>The <smbconfoption name="ldap passwd sync"/> can be set to one of three values: </para> <itemizedlist> <listitem> diff --git a/docs/smbdotconf/ldap/ldapport.xml b/docs/smbdotconf/ldap/ldapport.xml index 141382a640..8895c15c7f 100644 --- a/docs/smbdotconf/ldap/ldapport.xml +++ b/docs/smbdotconf/ldap/ldapport.xml @@ -8,7 +8,7 @@ at compile time.</para> <para>This option is used to control the tcp port number used to contact - the <link linkend="LDAPSERVER"><parameter moreinfo="none">ldap server</parameter></link>. + the <smbconfoption name="ldap server"/>. The default is to use the stand LDAPS port 636.</para> </description> <related>ldap ssl</related> diff --git a/docs/smbdotconf/ldap/ldapssl.xml b/docs/smbdotconf/ldap/ldapssl.xml index bd2f45fe3f..3c276b87e3 100644 --- a/docs/smbdotconf/ldap/ldapssl.xml +++ b/docs/smbdotconf/ldap/ldapssl.xml @@ -11,7 +11,7 @@ <command moreinfo="none">--with-ssl</command> option to the <filename moreinfo="none">configure</filename> script.</para> - <para>The <parameter moreinfo="none">ldap ssl</parameter> can be set to one of three values:</para> +<para>The <smbconfoption name="ldap ssl"/> can be set to one of three values:</para> <itemizedlist> <listitem> <para><parameter moreinfo="none">Off</parameter> = Never @@ -30,8 +30,7 @@ moreinfo="none">ldap server</parameter>. Only available when the backwards-compatiblity <command moreinfo="none">--with-ldapsam</command> option is specified - to configure. See <link linkend="PASSDBBACKEND"><parameter - moreinfo="none">passdb backend</parameter></link></para> + to configure. See <smbconfoption name="passdb backend"/></para> </listitem> </itemizedlist> </description> diff --git a/docs/smbdotconf/ldap/ldapsuffix.xml b/docs/smbdotconf/ldap/ldapsuffix.xml index 0bbb1c23e9..233c61040c 100644 --- a/docs/smbdotconf/ldap/ldapsuffix.xml +++ b/docs/smbdotconf/ldap/ldapsuffix.xml @@ -5,9 +5,8 @@ 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 <command moreinfo="none">ldap user - suffix</command> and <command moreinfo="none">ldap machine - suffix</command>. It also used as the base dn for all ldap + 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> diff --git a/docs/smbdotconf/ldap/ldapusersuffix.xml b/docs/smbdotconf/ldap/ldapusersuffix.xml index 133b6db707..d860fba0da 100644 --- a/docs/smbdotconf/ldap/ldapusersuffix.xml +++ b/docs/smbdotconf/ldap/ldapusersuffix.xml @@ -5,7 +5,7 @@ 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 <command>ldap suffix</command>.</para> + If this parameter is not specified, the value from <smbconfoption name="ldap suffix"/>.</para> </description> <value type="default"/> |