Merge branch-2-1

[netatalk.git] / man / man8 / afpd.8.tmpl

diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.tmpl
index 068cc7f38db00a99ac9ccd98ffd1a288d21d2fa1..1995473a7ae58170221b20a9ff88ae092eb14111 100644 (file)
--- a/man/man8/afpd.8.tmpl
+++ b/man/man8/afpd.8.tmpl
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: afpd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 08 Feb 2010
-.\"    Manual: Netatalk 2.1beta2
-.\"    Source: Netatalk 2.1beta2
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 21 Apr 2010
+.\"    Manual: Netatalk 2.1
+.\"    Source: Netatalk 2.1
 .\"  Language: English
 .\"
-.TH "AFPD" "8" "08 Feb 2010" "Netatalk 2.1beta2" "Netatalk 2.1beta2"
+.TH "AFPD" "8" "21 Apr 2010" "Netatalk 2.1" "Netatalk 2.1"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,23 +19,32 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-afpd \- AppleTalk Filing Protocol daemon
+afpd \- Apple Filing Protocol daemon
 .SH "SYNOPSIS"
-.HP \w'\fBafpd\fR\fB\fR\ 'u
-\fBafpd\fR\fB\fR [\-duptDTvI] [\-f\ \fIdefaultvolumes\fR] [\-s\ \fIsystemvolumes\fR] [\-n\ \fInbpname\fR] [\-c\ \fImaxconnections\fR] [\-g\ \fIguest\fR] [\-P\ \fIpidfile\fR] [\-S\ \fIport\fR] [\-L\ \fImessage\fR] [\-F\ \fIconfig\fR] [\-U\ \fIuamsv\fR] [\-m\ \fIumask\fR]
+.HP \w'\fBafpd\fR\fB\fR\fBafpd\fR\fB\fR\ 'u
+\fBafpd\fR\fB\fR [\-duptDTI] [\-f\ \fIdefaultvolumes\fR] [\-s\ \fIsystemvolumes\fR] [\-n\ \fInbpname\fR] [\-c\ \fImaxconnections\fR] [\-g\ \fIguest\fR] [\-P\ \fIpidfile\fR] [\-S\ \fIport\fR] [\-L\ \fImessage\fR] [\-F\ \fIconfigfile\fR] [\-U\ \fIuams\fR] [\-m\ \fIumask\fR]
+.br
+\fBafpd\fR\fB\fR \-v | \-V | \-h 
 .SH "DESCRIPTION"
 .PP
 \fBafpd\fR
-provides an AppleTalk Filing Protocol (AFP) interface to the Unix file system\&. It is normally started at boot time from /etc/rc\&.
+provides an Apple Filing Protocol (AFP) interface to the Unix file system\&. It is normally started at boot time from /etc/rc\&.
+.PP
+:ETCDIR:/afpd\&.conf
+is the configuration file used by
+\fBafpd\fR
+to determine the behavior and configuration of the different virtual file servers that it provides\&.
 .PP
 The list of volumes offered to the user is generated from
 :ETCDIR:/AppleVolumes\&.system
 and one of
 :ETCDIR:/AppleVolumes\&.default,
-~/AppleVolumes, or
-~/\&.AppleVolumes\&. The
+~/AppleVolumes,
+~/\&.AppleVolumes,
+~/applevolumes, or
+~/\&.applevolumes\&. The
 AppleVolumes
-files is used to specify volumes to mount and file name extension mappings\&. It is formatted as follows, one specification per line: pathname [ volumename ] \&.extension [ type [ creator ] ] If volumename is unspecified, the last component of pathname is used\&. No two volumes may have the same name\&. The extension \'\&.\' sets the default creator and type for otherwise untyped Unix files\&. Blank lines and lines beginning with `#\' are ignored\&.
+files is used to specify volumes to mount and file name extension mappings\&.
 .PP
 .SH "OPTIONS"
 .PP
@@ -86,6 +95,11 @@ Print version information and exit\&.
 Print verbose information and exit\&.
 .RE
 .PP
+\-h
+.RS 4
+Print help and exit\&.
+.RE
+.PP
 \-I
 .RS 4
 Use a platform specific icon\&. (Equivalent to
@@ -239,6 +253,11 @@ signal and wait for it to die on its own\&.
 .RE
 .SH "FILES"
 .PP
+:ETCDIR:/afpd\&.conf
+.RS 4
+configuration file used by afpd
+.RE
+.PP
 :ETCDIR:/AppleVolumes\&.default
 .RS 4
 list of default volumes to mount
@@ -249,11 +268,16 @@ list of default volumes to mount
 list of volumes to offer all users
 .RE
 .PP
-~/AppleVolumes
+~/AppleVolumes, ~/\&.AppleVolumes, ~/applevolumes, ~/\&.applevolumes
 .RS 4
 user\'s list of volumes to mount
 .RE
 .PP
+:ETCDIR:/afp_signature\&.conf
+.RS 4
+list of server signature
+.RE
+.PP
 :ETCDIR:/netatalk/msg/message\&.pid
 .RS 4
 contains messages to be sent to users\&.
@@ -265,6 +289,5 @@ contains messages to be sent to users\&.
 \fBhosts_access\fR(5),
 \fBafpd.conf\fR(5),
 \fBAppleVolumes.default\fR(5),
-\fBAppleVolumes.system\fR(5),
 \fBafp_signature.conf\fR(5),
 \fBdbd\fR(1)\&.