Import manpages from XML

diff --git a/man/man1/apple_dump.1 b/man/man1/apple_dump.1
index 56be391e3d1eaf4d96a5dabe51850854d44e39d5..032f1afb95a14e2967605346f80e0b539fa719d2 100644 (file)
--- a/man/man1/apple_dump.1
+++ b/man/man1/apple_dump.1
@@ -2,12 +2,12 @@
 .\"     Title: apple_dump
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 May 2012
+.\"      Date: 02 Jul 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "APPLE_DUMP" "1" "22 May 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "APPLE_DUMP" "1" "02 Jul 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,13 +22,13 @@
 apple_dump \- Dump AppleSingle/AppleDouble format data
 .SH "SYNOPSIS"
 .HP \w'\fBapple_dump\fR\fB\fR\fBapple_dump\fR\fB\fR\fBapple_dump\fR\fB\fR\fBapple_dump\fR\fB\fR\fBapple_dump\fR\fB\fR\fBapple_dump\fR\fB\fR\ 'u
-\fBapple_dump\fR\fB\fR [\-a] \fIFILE\fR | \fIDIR\fR 
+\fBapple_dump\fR\fB\fR [\-a] [\fIFILE\fR | \fIDIR\fR]
 .br
 \fBapple_dump\fR\fB\fR \-e \fIFILE\fR | \fIDIR\fR 
 .br
-\fBapple_dump\fR\fB\fR \-f \fIFILE\fR
+\fBapple_dump\fR\fB\fR \-f [\fIFILE\fR]
 .br
-\fBapple_dump\fR\fB\fR \-d \fIFILE\fR
+\fBapple_dump\fR\fB\fR \-d [\fIFILE\fR]
 .br
 \fBapple_dump\fR\fB\fR \-h | \-help | \-\-help 
 .br
@@ -37,6 +37,11 @@ apple_dump \- Dump AppleSingle/AppleDouble format data
 .PP
 \fBapple_dump\fR
 dump AppleSingle/AppleDouble format data\&.
+.PP
+With no
+\fIFILE\fR|\fIDIR\fR, or when
+\fIFILE\fR|\fIDIR\fR
+is \-, read standard input\&.
 .SH "OPTIONS"
 .PP
 \fB\-a\fR \fIFILE\fR|\fIDIR\fR

diff --git a/man/man5/afp.conf.5.tmpl b/man/man5/afp.conf.5.tmpl
index 5b5308468811b2302cf7b447be3214032a1cb8b1..1861f1773081f3f397c1d0b3418d40f548285da0 100644 (file)
--- a/man/man5/afp.conf.5.tmpl
+++ b/man/man5/afp.conf.5.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: afp.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 May 2012
+.\"      Date: 06 Jun 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP\&.CONF" "5" "22 May 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "AFP\&.CONF" "5" "06 Jun 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -631,11 +631,6 @@ AFP user home volume name\&. The default is
 \fIusers\'s home\fR\&.
 .RE
 .PP
-icon = \fIBOOLEAN\fR (default: \fIno\fR) \fB(G)\fR
-.RS 4
-Use the platform\-specific icon\&. Mac OS X doesn\'t display it\&.
-.RE
-.PP
 keep sessions = \fIBOOLEAN\fR (default: \fIno\fR) \fB(G)\fR
 .RS 4
 Enable "Continuous AFP Service"\&. This means restarting AFP and CNID service daemons master processes, but keeping the AFP session processes\&. This can be used to install (most) updates to Netatalk without interruping active AFP sessions\&. Existing AFP sessions will still run the version from before updating, but new AFP sessions will run the updated code\&. After enabling this option when sending SIGQUIT to the
@@ -1026,8 +1021,8 @@ and
 .SH "CNID BACKENDS"
 .PP
 The AFP protocol mostly refers to files and directories by ID and not by name\&. Netatalk needs a way to store these ID\'s in a persistent way, to achieve this several different CNID backends are available\&. The CNID Databases are by default located in the
-\&.AppleDB
-folder in the volume root\&.
+:STATEDIR:/netatalk/CNID/(volumename)/\&.AppleDB/
+directory\&.
 .PP
 cdb
 .RS 4
@@ -1054,7 +1049,9 @@ last
 .RS 4
 This backend is an exception, in terms of ID persistency\&. ID\'s are only valid for the current session\&. This is basically what
 \fBafpd\fR
-did in the 1\&.5 (and 1\&.6) versions\&. This backend is still available, as it is useful for e\&.g\&. sharing cdroms\&.
+did in the 1\&.5 (and 1\&.6) versions\&. This backend is still available, as it is useful for e\&.g\&. sharing cdroms\&. Starting with Netatalk 3\&.0, it becomes the
+\fIread only mode\fR
+automatically\&.
 .sp
 \fBWarning\fR: It is
 \fINOT\fR