Merge 2-2

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

diff --git a/man/man5/afp_voluuid.conf.5.tmpl b/man/man5/afp_voluuid.conf.5.tmpl
index c36a1124a38401388d941742ea03c2fc590c1b4f..8d3626d04c17b3712a534a3ae48270e87ad2793b 100644 (file)
--- a/man/man5/afp_voluuid.conf.5.tmpl
+++ b/man/man5/afp_voluuid.conf.5.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: afp_voluuid.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 8 March 2011
-.\"    Manual: Netatalk 2.2
-.\"    Source: Netatalk 2.2
+.\"      Date: 23 Mar 2012
+.\"    Manual: Netatalk 3.0
+.\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP_VOLUUID\&.CONF" "5" "8 March 2011" "Netatalk 2.2" "Netatalk 2.2"
+.TH "AFP_VOLUUID\&.CONF" "5" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
 afp_voluuid.conf \- Configuration file used by afpd(8) to specify UUID for Time Machine volume
 .SH "DESCRIPTION"
 .PP
-:ETCDIR:/afp_voluuid\&.conf
+:STATEDIR:/netatalk/afp_voluuid\&.conf
 is the configuration file used by
 \fBafpd\fR
 to specify UUID of Time Machine volume automagically\&. The configuration lines are composed like:
@@ -48,7 +48,7 @@ The leading spaces and tabs are ignored\&. Blank lines are ignored\&. The lines
 .PP
 This UUID is advertised by Zeroconf in order to provide robust disambiguation of Time Machine volume\&.
 .PP
-The afpd generates the UUID from random numbers and saves it into afp_voluuid\&.conf, only when setting "tm" option in AppleVolumes file\&.
+The afpd generates the UUID from random numbers and saves it into afp_voluuid\&.conf, only when setting "time machine = yes" option in afp\&.conf\&.
 .PP
 This file should not be thoughtlessly edited and be copied onto another server\&.
 .sp .5v
@@ -73,5 +73,6 @@ mary 6331E2D1\-446C\-B68C\-3066\-D685AADBE911
 .SH "SEE ALSO"
 .PP
 \fBafpd\fR(8),
-\fBAppleVolumes.default\fR(5),
-\fBavahi-daemon\fR(8)
+\fBafp.conf\fR(5),
+\fBavahi-daemon\fR(8),
+\fBmDNSResponder\fR(8)