X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=man%2Fman5%2Fafp.conf.5.tmpl;h=5b5308468811b2302cf7b447be3214032a1cb8b1;hb=cda3922d28edf8051adfb10c0f194b7a9a603796;hp=9f0c188ebc7703407c45287e10b162103a3f8bf7;hpb=1cc92fd77b5775c98ec55329a2cafe352fea462d;p=netatalk.git

diff --git a/man/man5/afp.conf.5.tmpl b/man/man5/afp.conf.5.tmpl
index 9f0c188e..5b530846 100644
--- a/man/man5/afp.conf.5.tmpl
+++ b/man/man5/afp.conf.5.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: afp.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 18 Apr 2012
+.\"      Date: 22 May 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP\&.CONF" "5" "18 Apr 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "AFP\&.CONF" "5" "22 May 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -326,6 +326,13 @@ Name of the LDAP attribute with the users short name\&.
 .sp
 .RE
 .PP
+ldap uuid string = \fISTRING\fR \fB(G)\fR
+.RS 4
+Format of the uuid string in the directory\&. A series of x and \-, where every x denotes a value 0\-9a\-f and every \- is a seperator\&.
+.sp
+Default: xxxxxxxx\-xxxx\-xxxx\-xxxx\-xxxxxxxxxxxx
+.RE
+.PP
 ldap group attr = \fIdn\fR \fB(G)\fR
 .RS 4
 Name of the LDAP attribute with the groups short name\&.
@@ -561,6 +568,11 @@ admin group = \fIgroup\fR \fB(G)\fR
 Allows users of a certain group to be seen as the superuser when they log in\&. This option is disabled by default\&.
 .RE
 .PP
+afp read locks = \fIBOOLEAN\fR (default: \fIno\fR) \fB(G)\fR
+.RS 4
+Whether to apply locks to the byte region read in FPRead calls\&. The AFP spec mandates this, but it\'s not really in line with UNIX semantics and is a performance hug\&.
+.RE
+.PP
 basedir regex = \fIregex\fR \fB(H)\fR
 .RS 4
 Regular expression which matches the parent directory of the user homes\&. In the simple case this is just a path ie
@@ -937,9 +949,9 @@ hide files and directories,where the path matches one of the \'/\' delimited vet
 .PP
 Boolean volume options\&.
 .PP
-acls = \fIBOOLEAN\fR (default: \fItrue\fR) \fB(V)\fR
+acls = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(V)\fR
 .RS 4
-Whether to flag volumes as supporting ACLs\&. If ACL support is compiled in, this is true by default\&.
+Whether to flag volumes as supporting ACLs\&. If ACL support is compiled in, this is yes by default\&.
 .RE
 .PP
 cnid dev = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(V)\fR
@@ -947,7 +959,7 @@ cnid dev = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(V)\fR
 Whether to use the device number in the CNID backends\&. Helps when the device number is not constant across a reboot, eg cluster, \&.\&.\&.
 .RE
 .PP
-convert adouble = \fIBOOLEAN\fR (default: \fItrue\fR) \fB(V)\fR
+convert appledouble = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(V)\fR
 .RS 4
 Whether automatic conversion from
 \fBappledouble = v2\fR