Merge sf/master

[netatalk.git] / man / man5 / afp_ldap.conf.5.tmpl

diff --git a/man/man5/afp_ldap.conf.5.tmpl b/man/man5/afp_ldap.conf.5.tmpl
index a5676616a239fdb249a5067b3ceac71bcd0f3c30..8ad13027b1a48aa084bab7b1f9253823f503d66f 100644 (file)
--- a/man/man5/afp_ldap.conf.5.tmpl
+++ b/man/man5/afp_ldap.conf.5.tmpl
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: afp_ldap.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 28 November 2009
-.\"    Manual: Netatalk 2.1
-.\"    Source: Netatalk 2.1
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 30 Mar 2011
+.\"    Manual: Netatalk 2.2
+.\"    Source: Netatalk 2.2
 .\"  Language: English
 .\"
-.TH "AFP_LDAP\&.CONF" "5" "28 November 2009" "Netatalk 2.1" "Netatalk 2.1"
+.TH "AFP_LDAP\&.CONF" "5" "30 Mar 2011" "Netatalk 2.2" "Netatalk 2.2"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -95,7 +95,7 @@ DN of the user container in LDAP\&.
 .sp
 .RE
 .PP
-ldap_userscobe
+ldap_userscope
 .RS 4
 Search scope for user search:
 \fBbase | one | sub\fR
@@ -147,7 +147,7 @@ ldap_auth_method = simple
 ldap_auth_dn     = cn=admin,dc=domain,dc=org
 ldap_auth_pw     = notthisone
 ldap_userbase    = ou=users,dc=domain,dc=org
-ldap_userscobe   = one
+ldap_userscope   = one
 ldap_groupbase   = ou=groups,dc=domain,dc=org
 ldap_groupscope  = one
 ldap_uuid_attr   = some_attribute
@@ -160,4 +160,5 @@ ldap_group_attr  = cn
 .SH "SEE ALSO"
 .PP
 \fBafpd\fR(8),
-\fBAppleVolumes.default\fR(5),\fBafpldaptest\fR(1)
+\fBAppleVolumes.default\fR(5),
+\fBafpldaptest\fR(1)