Merge sf/master

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

diff --git a/man/man5/netatalk.conf.5.tmpl b/man/man5/netatalk.conf.5.tmpl
index 78d32db745ef9609f9d3d5756af0acf5897edd54..6c9b4b748f05dda4fccd91fc92ebfc9863e9194f 100644 (file)
--- a/man/man5/netatalk.conf.5.tmpl
+++ b/man/man5/netatalk.conf.5.tmpl
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: netatalk.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 9 Jun 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 "NETATALK\&.CONF" "5" "9 Jun 2009" "Netatalk 2.1" "Netatalk 2.1"
+.TH "NETATALK\&.CONF" "5" "30 Mar 2011" "Netatalk 2.2" "Netatalk 2.2"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,11 +19,21 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-netatalk.conf \- Configuration file used by netatalk(8) to determine its general configuration
+netatalk.conf \- Configuration file used by Netatalk to determine its general configuration
+.SH "SYNOPSIS"
+.HP \w'\fB:ETCDIR:/netatalk\&.conf\fR\fB\fR\fB:DESTDIR:/etc/default/netatalk\fR\fB\fR\ 'u
+\fB:ETCDIR:/netatalk\&.conf\fR\fB\fR
+.br
+\fB:DESTDIR:/etc/default/netatalk\fR\fB\fR
 .SH "DESCRIPTION"
 .PP
 \fB:ETCDIR:/netatalk\&.conf\fR
-is the configuration file used by afpd to determine what portions of the file system will be shared via Appletalk, as well as their behaviors\&.
+is the configuration file used by afpd to determine what portions of the file system will be shared via AFP, as well as their behaviors\&.
+.PP
+If netatalk has been configured with \-\-enable\-debian, it is not
+\fB:ETCDIR:/netatalk\&.conf\fR
+but
+\fB:DESTDIR:/etc/default/netatalk\fR\&.
 .PP
 Any line not prefixed with
 \fB#\fR
@@ -105,5 +115,8 @@ Set the Unix codepage, used by atalkd and papd to convert extended characters fr
 .RE
 .SH "SEE ALSO"
 .PP
+\fBafpd\fR(8),
+\fBafpd.conf\fR(5),
+\fBcnid_metad\fR(8),
 \fBatalkd\fR(8),
 \fBatalkd.conf\fR(5)