Import manpages from XML

diff --git a/man/man1/uniconv.1.tmpl b/man/man1/uniconv.1.tmpl
index 0f3fac29de6e74612b92af7f2b84e919c3f03e06..729d35edf5b8de6ce1ebdb671e3158f7febe643a 100644 (file)
--- a/man/man1/uniconv.1.tmpl
+++ b/man/man1/uniconv.1.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: uniconv
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "UNICONV" "1" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "UNICONV" "1" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -189,4 +189,4 @@ example%\fB uniconv \-f UTF8 \-t ASCII \-m MAC_CYRILLIC /path/to/share\fR
 .\}
 .SH "SEE ALSO"
 .PP
-\fBAppleVolumes.default\fR(5),\fBafpd\fR(8),\fBiconv\fR(1),\fBcnid_metad\fR(8),\fBcnid_dbd\fR(8)
+\fBafp.conf\fR(5),\fBafpd\fR(8),\fBiconv\fR(1),\fBcnid_metad\fR(8),\fBcnid_dbd\fR(8)

diff --git a/man/man5/afp.conf.5.tmpl b/man/man5/afp.conf.5.tmpl
index 0724dd8c25d429d8d5f11ab3ede687447d672432..af6bb4ea0a9408a3b6f05236a0fbac6707913b38 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 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP\&.CONF" "5" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "AFP\&.CONF" "5" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -284,7 +284,7 @@ Allow Kerberos V for authentication (optional)
 .PP
 uam path = \fIpath\fR \fB(G)\fR
 .RS 4
-Sets the default path for UAMs for this server (default is :ETCDIR:/uams)\&.
+Sets the default path for UAMs for this server (default is :LIBDIR:/netatalk)\&.
 .RE
 .PP
 k5 keytab = \fIpath\fR \fB(G)\fR, k5 service = \fIservice\fR \fB(G)\fR, k5 realm = \fIrealm\fR \fB(G)\fR
@@ -552,8 +552,7 @@ syscall for sending file data to clients\&.
 vol dbpath = \fIpath\fR \fB(G)\fR
 .RS 4
 Sets the database information to be stored in path\&. You have to specifiy a writable location, even if the volume is read only\&. The default is
-$localstatedir/netatalk/CNID/, where $localstatedir defaults to
-/var\&.
+:STATEDIR:/netatalk/CNID/\&.
 .RE
 .PP
 basedir regex = \fIregex\fR \fB(H)\fR
@@ -636,7 +635,7 @@ Specifies the icon model that appears on clients\&. Defaults to off\&. Examples:
 signature = <text> \fB(G)\fR
 .RS 4
 Specify a server signature\&. The maximum length is 16 characters\&. This option is useful for clustered environments, to provide fault isolation etc\&. By default, afpd generate signature and saving it to
-:ETCDIR:/afp_signature\&.conf
+:STATEDIR:/netatalk/afp_signature\&.conf
 automatically (based on random number)\&. See also asip\-status\&.pl(1)\&.
 .RE
 .PP
@@ -689,7 +688,7 @@ If not specified Netatalk logs to syslogs daemon facilify\&. Otherwise it logs t
 log level = \fItype:level [type:level \&.\&.\&.]\fR \fB(G)\fR, log level = \fItype:level,[type:level, \&.\&.\&.]\fR \fB(G)\fR
 .RS 4
 Specify that any message of a loglevel up to the given
-\fBloglevel\fR
+\fBlog level\fR
 should be logged\&.
 .sp
 By default afpd logs to syslog with a default logging setup equivalent to
@@ -766,14 +765,14 @@ invalid users = \fIusers/groups\fR \fB(V)\fR
 The deny option specifies users and groups who are not allowed access to the share\&. It follows the same format as the "valid users" option\&.
 .RE
 .PP
-hosts allow = \fIIP host address/IP netmask bits[, \&.\&.\&. ]\fR \fB(V)\fR
+hosts allow = \fIIP host address/IP netmask bits [ \&.\&.\&. ]\fR \fB(V)\fR
 .RS 4
 Only listed hosts and networks are allowed, all others are rejected\&. The network address may be specified either in dotted\-decimal format for IPv4 or in hexadecimal format for IPv6\&.
 .sp
 Example: hosts allow = 10\&.1\&.0\&.0/16 10\&.2\&.1\&.100 2001:0db8:1234::/48
 .RE
 .PP
-hosts deny = \fIIP host address/IP netmask bits [\&.\&.\&.]\fR \fB(V)\fR
+hosts deny = \fIIP host address/IP netmask bits [ \&.\&.\&. ]\fR \fB(V)\fR
 .RS 4
 Listed hosts and nets are rejected, all others are allowed\&.
 .sp
@@ -1012,7 +1011,7 @@ folder in the volume root\&.
 .PP
 cdb
 .RS 4
-"Concurrent database", backend is based on Sleepycat\'s Berkely DB\&. With this backend several
+"Concurrent database", backend is based on Oracle Berkely DB\&. With this backend several
 \fBafpd\fR
 deamons access the CNID database directly\&. Berkeley DB locking is used to synchronize access, if more than one
 \fBafpd\fR

diff --git a/man/man5/afp_signature.conf.5.tmpl b/man/man5/afp_signature.conf.5.tmpl
index 786633d49add11ec1ad067edf85940ca0327b620..54e2267f557704e45023ac46971aa70c25d20611 100644 (file)
--- a/man/man5/afp_signature.conf.5.tmpl
+++ b/man/man5/afp_signature.conf.5.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: afp_signature.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP_SIGNATURE\&.CONF" "5" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "AFP_SIGNATURE\&.CONF" "5" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
 afp_signature.conf \- Configuration file used by afpd(8) to specify server signature
 .SH "DESCRIPTION"
 .PP
-:ETCDIR:/afp_signature\&.conf
+:STATEDIR:/netatalk/afp_signature\&.conf
 is the configuration file used by
 \fBafpd\fR
 to specify server signature automagically\&. The configuration lines are composed like:

diff --git a/man/man5/afp_voluuid.conf.5.tmpl b/man/man5/afp_voluuid.conf.5.tmpl
index 26900f6910b7f9e66121f39474d33f4b2a172272..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: 22 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFP_VOLUUID\&.CONF" "5" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.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:

diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.tmpl
index f282ea8de0f425db44ceb7037a300d1176ccf251..3a913925f3bff9e797bd4df2f96f88a2daea127c 100644 (file)
--- a/man/man8/afpd.8.tmpl
+++ b/man/man8/afpd.8.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: afpd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 21 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "AFPD" "8" "21 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "AFPD" "8" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -28,12 +28,13 @@ afpd \- Apple Filing Protocol daemon
 .SH "DESCRIPTION"
 .PP
 \fBafpd\fR
-provides an Apple 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 by
+\fBnetatalk\fR(8)\&.
 .PP
 :ETCDIR:/afp\&.conf
 is the configuration file used by
 \fBafpd\fR
-to determine the behavior and configuration of the different virtual file servers that it provides\&.
+to determine the behavior and configuration of a file server\&.
 .SH "OPTIONS"
 .PP
 \-d
@@ -59,7 +60,7 @@ Print help and exit\&.
 \-F \fIconfigfile\fR
 .RS 4
 Specifies the configuration file to use\&. (Defaults to
-:ETCDIR:/netatalk/afp\&.conf\&.)
+:ETCDIR:/afp\&.conf\&.)
 .RE
 .SH "SIGNALS"
 .PP
@@ -131,12 +132,12 @@ process will look in the message directory configured at build time for a file n
 configuration file used by afpd
 .RE
 .PP
-afp_signature\&.conf
+:STATEDIR:/netatalk/afp_signature\&.conf
 .RS 4
 list of server signature
 .RE
 .PP
-afp_voluuid\&.conf
+:STATEDIR:/netatalk/afp_voluuid\&.conf
 .RS 4
 list of UUID for Time Machine volume
 .RE
@@ -147,6 +148,7 @@ contains messages to be sent to users\&.
 .RE
 .SH "SEE ALSO"
 .PP
+\fBnetatalk\fR(8),
 \fBhosts_access\fR(5),
 \fBafp.conf\fR(5),
 \fBafp_signature.conf\fR(5),

diff --git a/man/man8/cnid_metad.8.tmpl b/man/man8/cnid_metad.8.tmpl
index e0a4d0a4804faad25848b4fc1b7cf80636a2740d..f96778f1b12bb761ed815e118ba41ce9aa03592a 100644 (file)
--- a/man/man8/cnid_metad.8.tmpl
+++ b/man/man8/cnid_metad.8.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: cnid_metad
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Mar 2012
+.\"      Date: 23 Mar 2012
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "CNID_METAD" "8" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
+.TH "CNID_METAD" "8" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -36,9 +36,8 @@ daemon\&. It keeps track of the status of a
 \fBcnid_dbd\fR
 instance once started and will restart it if necessary\&.
 \fBcnid_metad\fR
-is normally started at boot time from
-/etc/rc
-or equivalent and runs until shutdown\&.
+is normally started at boot time by
+\fBnetatalk\fR(8) and runs until shutdown\&.
 .SH "OPTIONS"
 .PP
 \fB\-d\fR
@@ -75,6 +74,7 @@ is restarted
 processes will transparently reconnect\&.
 .SH "SEE ALSO"
 .PP
+\fBnetatalk\fR(8),
 \fBcnid_dbd\fR(8),
 \fBafpd\fR(8),
 \fBdbd\fR(1),