Merge branch-2-1

[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 ad7ad55bd422ec181a0dbbd63ff325cda419e1b2..8adcb66c5484ea948f11d6b8bcf3073832b956a6 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.1beta2
-.\"    Source: Netatalk 2.1beta2
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 26 Sep 2010
+.\"    Manual: Netatalk 2.2
+.\"    Source: Netatalk 2.2
 .\"  Language: English
 .\"
-.TH "NETATALK\&.CONF" "5" "9 Jun 2009" "Netatalk 2.1beta2" "Netatalk 2.1beta2"
+.TH "NETATALK\&.CONF" "5" "26 Sep 2010" "Netatalk 2.2" "Netatalk 2.2"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -20,11 +20,21 @@
 .\" -----------------------------------------------------------------
 .SH "NAME"
 netatalk.conf \- Configuration file used by netatalk(8) 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 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
 is interpreted\&. The configuration lines are composed like: