From c9882a2e4237ed0128318170df19beec41d9ae69 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Thu, 10 Mar 2011 08:42:16 +0100 Subject: [PATCH] Freshly generated manpages from XML sources --- man/man1/aecho.1 | 6 +-- man/man1/afppasswd.1 | 6 +-- man/man1/apple_dump.1 | 6 +-- man/man1/asip-status.pl.1.tmpl | 6 +-- man/man1/getzones.1 | 6 +-- man/man1/megatron.1 | 6 +-- man/man1/nbp.1 | 6 +-- man/man1/netatalk-config.1 | 4 +- man/man1/pap.1 | 6 +-- man/man1/psorder.1 | 6 +-- man/man1/uniconv.1.tmpl | 6 +-- man/man3/atalk_aton.3 | 6 +-- man/man3/nbp_name.3 | 6 +-- man/man4/atalk.4 | 6 +-- man/man5/AppleVolumes.default.5.tmpl | 13 +++--- man/man5/afp_ldap.conf.5.tmpl | 6 +-- man/man5/afp_signature.conf.5.tmpl | 12 ++--- man/man5/afpd.conf.5.tmpl | 65 ++++++++++++++-------------- man/man5/atalkd.conf.5.tmpl | 6 +-- man/man5/papd.conf.5.tmpl | 6 +-- man/man8/afpd.8.tmpl | 22 +++++++--- man/man8/atalkd.8.tmpl | 6 +-- man/man8/cnid_metad.8.tmpl | 6 +-- man/man8/papd.8.tmpl | 6 +-- man/man8/papstatus.8.tmpl | 6 +-- man/man8/psf.8.tmpl | 6 +-- man/man8/timelord.8 | 4 +- 27 files changed, 127 insertions(+), 119 deletions(-) diff --git a/man/man1/aecho.1 b/man/man1/aecho.1 index 24e108ae..3dfad5fe 100644 --- a/man/man1/aecho.1 +++ b/man/man1/aecho.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "AECHO" "1" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "AECHO" "1" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/afppasswd.1 b/man/man1/afppasswd.1 index 0fea6807..8d72f85c 100644 --- a/man/man1/afppasswd.1 +++ b/man/man1/afppasswd.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 22 Aug 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "AFPPASSWD" "1" "22 Aug 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "AFPPASSWD" "1" "22 Aug 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/apple_dump.1 b/man/man1/apple_dump.1 index d915cd8c..e549b42e 100644 --- a/man/man1/apple_dump.1 +++ b/man/man1/apple_dump.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 31 Mar 2010 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "APPLE_DUMP" "1" "31 Mar 2010" "Netatalk 2.1" "Netatalk 2.1" +.TH "APPLE_DUMP" "1" "31 Mar 2010" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/asip-status.pl.1.tmpl b/man/man1/asip-status.pl.1.tmpl index f5c2d64a..03eb451a 100644 --- a/man/man1/asip-status.pl.1.tmpl +++ b/man/man1/asip-status.pl.1.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 22 Aug 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "ASIP\-STATUS\&.PL" "1" "22 Aug 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "ASIP\-STATUS\&.PL" "1" "22 Aug 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/getzones.1 b/man/man1/getzones.1 index c6014862..861ca783 100644 --- a/man/man1/getzones.1 +++ b/man/man1/getzones.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "GETZONES" "1" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "GETZONES" "1" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/megatron.1 b/man/man1/megatron.1 index b665673e..7b55c76f 100644 --- a/man/man1/megatron.1 +++ b/man/man1/megatron.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 8 Jan 1992 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "MEGATRON" "1" "8 Jan 1992" "Netatalk 2.1" "Netatalk 2.1" +.TH "MEGATRON" "1" "8 Jan 1992" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/nbp.1 b/man/man1/nbp.1 index 036cd318..0958b997 100644 --- a/man/man1/nbp.1 +++ b/man/man1/nbp.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 24 June 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "NBP" "1" "24 June 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "NBP" "1" "24 June 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/netatalk-config.1 b/man/man1/netatalk-config.1 index 3ceecbce..3d4d9a8b 100644 --- a/man/man1/netatalk-config.1 +++ b/man/man1/netatalk-config.1 @@ -4,10 +4,10 @@ .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 09 June 2001 .\" Manual: The Netatalk Project -.\" Source: Netatalk 2.1 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "NETATALK\-CONFIG" "1" "09 June 2001" "Netatalk 2.1" "The Netatalk Project" +.TH "NETATALK\-CONFIG" "1" "09 June 2001" "Netatalk 2.2" "The Netatalk Project" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/pap.1 b/man/man1/pap.1 index 784ae4b7..bc333287 100644 --- a/man/man1/pap.1 +++ b/man/man1/pap.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 6 May 2002 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PAP" "1" "6 May 2002" "Netatalk 2.1" "Netatalk 2.1" +.TH "PAP" "1" "6 May 2002" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/psorder.1 b/man/man1/psorder.1 index 9f736cb0..724fe555 100644 --- a/man/man1/psorder.1 +++ b/man/man1/psorder.1 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PSORDER" "1" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "PSORDER" "1" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man1/uniconv.1.tmpl b/man/man1/uniconv.1.tmpl index 1d49c30b..9e314b52 100644 --- a/man/man1/uniconv.1.tmpl +++ b/man/man1/uniconv.1.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 24 Jun 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "UNICONV" "1" "24 Jun 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "UNICONV" "1" "24 Jun 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man3/atalk_aton.3 b/man/man3/atalk_aton.3 index f8420ead..d4f5d94f 100644 --- a/man/man3/atalk_aton.3 +++ b/man/man3/atalk_aton.3 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 12 Jan 1994 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "ATALK_ATON" "3" "12 Jan 1994" "Netatalk 2.1" "Netatalk 2.1" +.TH "ATALK_ATON" "3" "12 Jan 1994" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man3/nbp_name.3 b/man/man3/nbp_name.3 index 4a9e1026..6791f4ab 100644 --- a/man/man3/nbp_name.3 +++ b/man/man3/nbp_name.3 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 12 Jan 1994 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "NBP_NAME" "3" "12 Jan 1994" "Netatalk 2.1" "Netatalk 2.1" +.TH "NBP_NAME" "3" "12 Jan 1994" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man4/atalk.4 b/man/man4/atalk.4 index 24be709e..356b93e7 100644 --- a/man/man4/atalk.4 +++ b/man/man4/atalk.4 @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "ATALK" "4" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "ATALK" "4" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man5/AppleVolumes.default.5.tmpl b/man/man5/AppleVolumes.default.5.tmpl index c754aeea..0885b609 100644 --- a/man/man5/AppleVolumes.default.5.tmpl +++ b/man/man5/AppleVolumes.default.5.tmpl @@ -2,12 +2,12 @@ .\" Title: AppleVolumes.default .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 07 Dec 2010 +.\" Date: 08 Mar 2011 .\" Manual: Netatalk 2.2 .\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "APPLEVOLUMES\&.DEFAU" "5" "07 Dec 2010" "Netatalk 2.2" "Netatalk 2.2" +.TH "APPLEVOLUMES\&.DEFAU" "5" "08 Mar 2011" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -353,11 +353,9 @@ rwlist:\fI[users/groups]\fR Allows certain users and groups to have read/write access to a share\&. This follows the allow option format\&. .RE .PP -veto:\fI[vetoed name]\fR +veto:\fI[vetoed names]\fR .RS 4 -hide files and directories,where the path matches one of the \'/\' delimited vetoed names\&. Matches are partial, e\&.g\&. path is -/abc/def/file -and veto:/abc/ will hide the file\&. +hide files and directories,where the path matches one of the \'/\' delimited vetoed names\&. The veto string must always be terminated with a \'/\', eg\&. "veto1/", "veto1/veto2/"\&. .RE .PP volcharset:\fI[charset]\fR @@ -724,5 +722,4 @@ Provides compatibility with Apple II clients\&. (legacy) .PP \fBafpd.conf\fR(5), \fBafpd\fR(8), -\fBafp_ldap.conf\fR(5), -\fBafp_acls\fR(8) +\fBafp_ldap.conf\fR(5) diff --git a/man/man5/afp_ldap.conf.5.tmpl b/man/man5/afp_ldap.conf.5.tmpl index 0b909e33..64a1accc 100644 --- a/man/man5/afp_ldap.conf.5.tmpl +++ b/man/man5/afp_ldap.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 28 November 2009 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" 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" "28 November 2009" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man5/afp_signature.conf.5.tmpl b/man/man5/afp_signature.conf.5.tmpl index 59de3301..592b8fbb 100644 --- a/man/man5/afp_signature.conf.5.tmpl +++ b/man/man5/afp_signature.conf.5.tmpl @@ -2,12 +2,12 @@ .\" Title: afp_signature.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 29 March 2010 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Date: 08 Mar 2011 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "AFP_SIGNATURE\&.CONF" "5" "29 March 2010" "Netatalk 2.1" "Netatalk 2.1" +.TH "AFP_SIGNATURE\&.CONF" "5" "08 Mar 2011" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -25,7 +25,7 @@ afp_signature.conf \- Configuration file used by afpd(8) to specify server signa :ETCDIR:/afp_signature\&.conf is the configuration file used by \fBafpd\fR -to specify server signature automatically\&. The configuration lines are composed like: +to specify server signature automagically\&. The configuration lines are composed like: .PP \fI"server name"\fR \fIhexa\-string\fR @@ -50,7 +50,7 @@ Server Signature is unique 16\-bytes identifier used to prevent logging on to th .PP Netatalk 2\&.0 and earlier generated server signature by using gethostid()\&. There was a problem that another servers have the same signature because the hostid is not unique enough\&. .PP -Netatalk 2\&.1 generates the signature from random numbers and saves it into afp_signature\&.conf\&. When starting next time, it is read from this file\&. +Current netatalk generates the signature from random numbers and saves it into afp_signature\&.conf\&. When starting next time, it is read from this file\&. .PP This file should not be thoughtlessly edited and be copied onto another server\&. If it wants to set the signature intentionally, use the option "\-signature user:xxxx" in afpd\&.conf\&. In this case, afp_signature\&.conf is not used\&. .sp .5v diff --git a/man/man5/afpd.conf.5.tmpl b/man/man5/afpd.conf.5.tmpl index f0613040..6c82b9f0 100644 --- a/man/man5/afpd.conf.5.tmpl +++ b/man/man5/afpd.conf.5.tmpl @@ -2,12 +2,12 @@ .\" Title: afpd.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 1 November 2010 +.\" Date: 14 February 2011 .\" Manual: Netatalk 2.2 .\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "AFPD\&.CONF" "5" "1 November 2010" "Netatalk 2.2" "Netatalk 2.2" +.TH "AFPD\&.CONF" "5" "14 February 2011" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ is used instead of a server name, the default server is specified\&. Server name .PP Each server has to be configured on a \fBsingle\fR -line\&. Though newline escaping is supported\&. +line\&. Though, using "\e" character, newline escaping is supported\&. .sp .5v .RE The possible options and their meanings are: @@ -90,7 +90,7 @@ allows guest logins .PP uams_clrtxt\&.so .RS 4 -(uams_pam\&.so or uams_passwd\&.so) Allow logins with passwords transmitted in the clear\&. +(uams_pam\&.so or uams_passwd\&.so) Allow logins with passwords transmitted in the clear\&. (legacy) .RE .PP uams_randum\&.so @@ -98,7 +98,7 @@ uams_randum\&.so allows Random Number and Two\-Way Random Number Exchange for authentication (requires a separate file containing the passwords, either :ETCDIR:/afppasswd file or the one specified via \fB\-passwdfile\fR\&. See \fBafppasswd\fR(1) -for details +for details\&. (legacy) .RE .PP uams_dhx\&.so @@ -256,24 +256,24 @@ listens to\&. The default is advertise the first IP address of the system, but t when used together with the \fB\-proxy\fR option\&. -.PP \fBExample.\ \&IP/hostname example configuration\fR fluxxus \fB\-hostname\fR afp\&.apple\&.com \fB\-ipaddr\fR 127\&.0\&.0\&.1 \fB\-fqdn\fR www\&.microsoft\&.comResult:.TS -allbox tab(:); -l -l -l. -T{ -(UTF8) Server name: fluxxus -T} -T{ -Listening and advertised network address: - 127\&.0\&.0\&.1 -T} -T{ -Advertised network address: - www\&.microsoft\&.com -T} -.TE -.sp 1 +.PP +\fBExample.\ \&afpd.conf onfiguration line\fR +.sp +.if n \{\ +.RS 4 +.\} +.nf + fluxxus \-hostname afp\&.example\&.org \-ipaddr 192\&.168\&.0\&.1 \-fqdn www\&.example\&.com + +.fi +.if n \{\ +.RE +.\} +.sp + +\fBResult\fR +.sp +(UTF8) Server name: fluxxus, Listening and advertised network address: 192\&.168\&.0\&.1, Advertised network address: www\&.example\&.com, hostname is not used\&. .RE .PP \-port \fI[port number]\fR @@ -371,7 +371,7 @@ Specifies the user that guests should use (default is "nobody")\&. The name shou .PP \-[no]icon .RS 4 -[Dont\'t] Use the platform\-specific icon\&. Recent Mac OS don\'t display it any longer\&. +[Don\'t] Use the platform\-specific icon\&. Recent Mac OS don\'t display it any longer\&. .RE .PP \-loginmesg \fI[message]\fR @@ -427,7 +427,6 @@ Max length of UTF8\-MAC volume name for Mac OS X\&. Note that Hangul is especial .nf 73: limit of Mac OS X 10\&.1 80: limit for Mac OS X 10\&.4/10\&.5 (default) -123: limit for Mac OS X 10\&.6 255: limit of spec .fi .if n \{\ @@ -482,7 +481,7 @@ The config is case\-ignoring .RS 4 .\} .nf -\-setuplog "default log_info /var/log/afpd\&.log" +\- \-setuplog "default log_info /var/log/afpd\&.log" .fi .if n \{\ .RE @@ -494,7 +493,7 @@ The config is case\-ignoring .RS 4 .\} .nf -\-setuplog "default log_maxdebug /var/log/afpd\&.log" +\- \-setuplog "default log_maxdebug /var/log/afpd\&.log" .fi .if n \{\ .RE @@ -506,7 +505,7 @@ The config is case\-ignoring .RS 4 .\} .nf -\-setuplog "default log_info /var/log/afpd\&.log" +\- \-setuplog "default log_info /var/log/afpd\&.log" \e \-setuplog "UAMSDaemon log_maxdebug /var/log/uams\&.log" .fi .if n \{\ @@ -526,7 +525,7 @@ specifying any string as filename is sufficient for the config parser to disting .RS 4 .\} .nf -\-unsetuplog "default \-" +\- \-unsetuplog "default \-" .fi .if n \{\ .RE @@ -553,7 +552,7 @@ Specify the number of tickles to send before timing out a connection\&. The defa .RS 4 .\} .nf -\- \-transall \-uamlist uams_dhx\&.so,uams_dhx2\&.so +\- \-tcp \-noddp \-uamlist uams_dhx\&.so,uams_dhx2\&.so \-nosavepassword .fi .if n \{\ .RE @@ -565,7 +564,7 @@ Specify the number of tickles to send before timing out a connection\&. The defa .RS 4 .\} .nf -\- \-transall \-maccodepage mac_cyrillic \-unixcodepage utf8 +\- \-maccodepage mac_cyrillic \-unixcodepage utf8 .fi .if n \{\ .RE @@ -577,7 +576,7 @@ Specify the number of tickles to send before timing out a connection\&. The defa .RS 4 .\} .nf -\- \-transall \-uamlist uams_dhx\&.so,uams_dhx2\&.so,uams_guest\&.so,uams_gss\&.so \e +\- \-uamlist uams_dhx\&.so,uams_dhx2\&.so,uams_guest\&.so,uams_gss\&.so \e \-k5service afpserver \-k5keytab /path/to/afpserver\&.keytab \e \-k5realm YOUR\&.REALM \-fqdn your\&.fqdn\&.namel:548 .fi @@ -593,7 +592,7 @@ Specify the number of tickles to send before timing out a connection\&. The defa .nf "Guest Server" \-uamlist uams_guest\&.so \-loginmesg "Welcome guest!" "User Server" \-uamlist uams_dhx2\&.so \-port 12000 -"special" \-notcp \-defaultvol \-systemvol +"special" \-ddp \-notcp \-defaultvol \-systemvol .fi .if n \{\ .RE diff --git a/man/man5/atalkd.conf.5.tmpl b/man/man5/atalkd.conf.5.tmpl index b618c764..ed51c8cf 100644 --- a/man/man5/atalkd.conf.5.tmpl +++ b/man/man5/atalkd.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 22 September 2000 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "ATALKD\&.CONF" "5" "22 September 2000" "Netatalk 2.1" "Netatalk 2.1" +.TH "ATALKD\&.CONF" "5" "22 September 2000" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man5/papd.conf.5.tmpl b/man/man5/papd.conf.5.tmpl index ca8103fa..caf5f60e 100644 --- a/man/man5/papd.conf.5.tmpl +++ b/man/man5/papd.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 06 Sep 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PAPD\&.CONF" "5" "06 Sep 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "PAPD\&.CONF" "5" "06 Sep 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.tmpl index 1995473a..9fc6dd37 100644 --- a/man/man8/afpd.8.tmpl +++ b/man/man8/afpd.8.tmpl @@ -2,12 +2,12 @@ .\" Title: afpd .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 21 Apr 2010 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Date: 08 Mar 2011 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "AFPD" "8" "21 Apr 2010" "Netatalk 2.1" "Netatalk 2.1" +.TH "AFPD" "8" "08 Mar 2011" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -278,7 +278,17 @@ user\'s list of volumes to mount list of server signature .RE .PP -:ETCDIR:/netatalk/msg/message\&.pid +:ETCDIR:/afp_voluuid\&.conf +.RS 4 +list of UUID for Time Machine volume +.RE +.PP +:ETCDIR:/afp_ldap\&.conf +.RS 4 +configuration file for LDAP and ACL support +.RE +.PP +:ETCDIR:/msg/message\&.pid .RS 4 contains messages to be sent to users\&. .RE @@ -290,4 +300,6 @@ contains messages to be sent to users\&. \fBafpd.conf\fR(5), \fBAppleVolumes.default\fR(5), \fBafp_signature.conf\fR(5), +\fBafp_voluuid.conf\fR(5), +\fBafp_ldap.conf\fR(5), \fBdbd\fR(1)\&. diff --git a/man/man8/atalkd.8.tmpl b/man/man8/atalkd.8.tmpl index 3f478fab..819e3889 100644 --- a/man/man8/atalkd.8.tmpl +++ b/man/man8/atalkd.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 06 Sep 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "ATALKD" "8" "06 Sep 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "ATALKD" "8" "06 Sep 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/cnid_metad.8.tmpl b/man/man8/cnid_metad.8.tmpl index 1698faab..2822e2f0 100644 --- a/man/man8/cnid_metad.8.tmpl +++ b/man/man8/cnid_metad.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 23 Dec 2009 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "CNID_METAD" "8" "23 Dec 2009" "Netatalk 2.1" "Netatalk 2.1" +.TH "CNID_METAD" "8" "23 Dec 2009" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/papd.8.tmpl b/man/man8/papd.8.tmpl index 3e94ed8b..c48cf800 100644 --- a/man/man8/papd.8.tmpl +++ b/man/man8/papd.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 06 September 2004 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PAPD" "8" "06 September 2004" "Netatalk 2.1" "Netatalk 2.1" +.TH "PAPD" "8" "06 September 2004" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/papstatus.8.tmpl b/man/man8/papstatus.8.tmpl index ad4b6fbd..d0bc11d0 100644 --- a/man/man8/papstatus.8.tmpl +++ b/man/man8/papstatus.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PAPSTATUS" "8" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "PAPSTATUS" "8" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/psf.8.tmpl b/man/man8/psf.8.tmpl index 18913946..ed9f59e2 100644 --- a/man/man8/psf.8.tmpl +++ b/man/man8/psf.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 17 Dec 1991 -.\" Manual: Netatalk 2.1 -.\" Source: Netatalk 2.1 +.\" Manual: Netatalk 2.2 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "PSF" "8" "17 Dec 1991" "Netatalk 2.1" "Netatalk 2.1" +.TH "PSF" "8" "17 Dec 1991" "Netatalk 2.2" "Netatalk 2.2" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/timelord.8 b/man/man8/timelord.8 index 46a68293..14964862 100644 --- a/man/man8/timelord.8 +++ b/man/man8/timelord.8 @@ -4,10 +4,10 @@ .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 27 Jun 2001 .\" Manual: The Netatalk Project -.\" Source: Netatalk 2.1 +.\" Source: Netatalk 2.2 .\" Language: English .\" -.TH "TIMELORD" "8" "27 Jun 2001" "Netatalk 2.1" "The Netatalk Project" +.TH "TIMELORD" "8" "27 Jun 2001" "Netatalk 2.2" "The Netatalk Project" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -- 2.39.2