From 0414d4ea51a7eaa34482fba80beb05777c64912b Mon Sep 17 00:00:00 2001 From: franklahm Date: Mon, 5 Apr 2010 10:06:20 +0000 Subject: [PATCH] Rev versions to 2.1beta2, checkin changed manpages --- VERSION | 2 +- man/man1/dbd.1 | 8 ++++---- man/man5/AppleVolumes.default.5.tmpl | 29 ++++++++++++++++++++++------ man/man5/afp_signature.conf.5.tmpl | 6 +++--- man/man5/afpd.conf.5.tmpl | 6 +++--- man/man5/netatalk.conf.5.tmpl | 6 +++--- man/man8/afpd.8.tmpl | 19 ++++++++++++------ 7 files changed, 50 insertions(+), 26 deletions(-) diff --git a/VERSION b/VERSION index b5554293..25d4e850 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1beta1 +2.1beta2 diff --git a/man/man1/dbd.1 b/man/man1/dbd.1 index 71eb12c2..819ec9be 100644 --- a/man/man1/dbd.1 +++ b/man/man1/dbd.1 @@ -60,7 +60,7 @@ Compare CNIDs in database with volume .sp -1 .IP \(bu 2.3 .\} -Test if AppleDouble directories exist +Test if \&.AppleDouble directories exist .RE .sp .RS 4 @@ -93,7 +93,7 @@ Report orphaned AppleDouble files .sp -1 .IP \(bu 2.3 .\} -Report directories inside AppleDouble directories +Report directories inside \&.AppleDouble directories .RE .sp .RS 4 @@ -163,7 +163,7 @@ Sync CNIDSs from database with volume .sp -1 .IP \(bu 2.3 .\} -Ensure AppleDouble directories exist +Ensure \&.AppleDouble directories exist .RE .sp .RS 4 @@ -196,7 +196,7 @@ Delete orphaned AppleDouble files .sp -1 .IP \(bu 2.3 .\} -Report directories inside AppleDouble directories +Report directories inside \&.AppleDouble directories .RE .sp .RS 4 diff --git a/man/man5/AppleVolumes.default.5.tmpl b/man/man5/AppleVolumes.default.5.tmpl index 2e8e9bc9..998c90d6 100644 --- a/man/man5/AppleVolumes.default.5.tmpl +++ b/man/man5/AppleVolumes.default.5.tmpl @@ -2,12 +2,12 @@ .\" Title: AppleVolumes.default .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.3 -.\" Date: 23 Dec 2009 -.\" Manual: Netatalk 2.1beta2 -.\" Source: Netatalk 2.1beta2 +.\" Date: 31 Mar 2010 +.\" Manual: Netatalk 2.1 +.\" Source: Netatalk 2.1 .\" Language: English .\" -.TH "APPLEVOLUMES\&.DEFAU" "5" "23 Dec 2009" "Netatalk 2.1beta2" "Netatalk 2.1beta2" +.TH "APPLEVOLUMES\&.DEFAU" "5" "31 Mar 2010" "Netatalk 2.1" "Netatalk 2.1" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -115,6 +115,13 @@ dbpath:\fI[path]\fR Sets the database information to be stored in path\&. You have to specifiy a writable location, even if the volume is read only\&. .RE .PP +cnidserver:\fI[fqdn|IP[:port]]\fR +.RS 4 +Query this servername or IP address (default:\fIlocalhost\fR) and port (default: +\fI4700\fR) for CNIDs\&. Only used with CNID backend "\fIdbd\fR"\&. This option here overrides any setting from +afpd\&.conf:\fBcnidserver\fR\&. +.RE +.PP ea:\fI[none|auto|sys|ad]\fR .RS 4 Specify how Extended Attributes @@ -145,7 +152,7 @@ Use filesystem Extended Attributes\&. ad .RS 4 Use files in -\fIAppleDouble\fR +\fI\&.AppleDouble\fR directories\&. .RE .PP @@ -228,7 +235,7 @@ password:\fI[password]\fR This option allows you to set a volume password, which can be a maximum of 8 characters long (using ASCII strongly recommended at the time of this writing)\&. .RE .PP -perm|fperm|dperm:[mode] +perm|fperm|dperm:\fI[mode]\fR .RS 4 Add(or) with the client requested permissions: \fBperm\fR @@ -252,6 +259,11 @@ is for directories only\&. Use with .\} .RE .PP +umask:\fI[mode]\fR +.RS 4 +set perm mask\&. +.RE +.PP preexec:\fI[command]\fR .RS 4 command to be run when the volume is mounted, ignored for user defined volumes @@ -548,6 +560,11 @@ Allows a volume to be declared as being a "dropbox\&." Note that netatalk must b \fIWarning\fR: This option is deprecated and might not work as expected\&. .RE .PP +dropkludge +.RS 4 +same as "dropbox"\&. +.RE +.PP mswindows .RS 4 Forces filename restrictions imposed by MS WinXX\&. diff --git a/man/man5/afp_signature.conf.5.tmpl b/man/man5/afp_signature.conf.5.tmpl index 587c9149..cb27350a 100644 --- a/man/man5/afp_signature.conf.5.tmpl +++ b/man/man5/afp_signature.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.3 .\" Date: 29 March 2010 -.\" Manual: Netatalk 2.1beta2 -.\" Source: Netatalk 2.1beta2 +.\" Manual: Netatalk 2.1 +.\" Source: Netatalk 2.1 .\" Language: English .\" -.TH "AFP_SIGNATURE\&.CONF" "5" "29 March 2010" "Netatalk 2.1beta2" "Netatalk 2.1beta2" +.TH "AFP_SIGNATURE\&.CONF" "5" "29 March 2010" "Netatalk 2.1" "Netatalk 2.1" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man5/afpd.conf.5.tmpl b/man/man5/afpd.conf.5.tmpl index b56c1f9a..4165cd82 100644 --- a/man/man5/afpd.conf.5.tmpl +++ b/man/man5/afpd.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.3 .\" Date: 23 December 2009 -.\" Manual: Netatalk 2.1beta2 -.\" Source: Netatalk 2.1beta2 +.\" Manual: Netatalk 2.1 +.\" Source: Netatalk 2.1 .\" Language: English .\" -.TH "AFPD\&.CONF" "5" "23 December 2009" "Netatalk 2.1beta2" "Netatalk 2.1beta2" +.TH "AFPD\&.CONF" "5" "23 December 2009" "Netatalk 2.1" "Netatalk 2.1" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man5/netatalk.conf.5.tmpl b/man/man5/netatalk.conf.5.tmpl index ad7ad55b..499bd6b5 100644 --- a/man/man5/netatalk.conf.5.tmpl +++ b/man/man5/netatalk.conf.5.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.3 .\" Date: 9 Jun 2009 -.\" Manual: Netatalk 2.1beta2 -.\" Source: Netatalk 2.1beta2 +.\" Manual: Netatalk 2.1 +.\" Source: Netatalk 2.1 .\" Language: English .\" -.TH "NETATALK\&.CONF" "5" "9 Jun 2009" "Netatalk 2.1beta2" "Netatalk 2.1beta2" +.TH "NETATALK\&.CONF" "5" "9 Jun 2009" "Netatalk 2.1" "Netatalk 2.1" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.tmpl index 068cc7f3..b30d9b58 100644 --- a/man/man8/afpd.8.tmpl +++ b/man/man8/afpd.8.tmpl @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.3 .\" Date: 08 Feb 2010 -.\" Manual: Netatalk 2.1beta2 -.\" Source: Netatalk 2.1beta2 +.\" Manual: Netatalk 2.1 +.\" Source: Netatalk 2.1 .\" Language: English .\" -.TH "AFPD" "8" "08 Feb 2010" "Netatalk 2.1beta2" "Netatalk 2.1beta2" +.TH "AFPD" "8" "08 Feb 2010" "Netatalk 2.1" "Netatalk 2.1" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -21,8 +21,10 @@ .SH "NAME" afpd \- AppleTalk Filing Protocol daemon .SH "SYNOPSIS" -.HP \w'\fBafpd\fR\fB\fR\ 'u -\fBafpd\fR\fB\fR [\-duptDTvI] [\-f\ \fIdefaultvolumes\fR] [\-s\ \fIsystemvolumes\fR] [\-n\ \fInbpname\fR] [\-c\ \fImaxconnections\fR] [\-g\ \fIguest\fR] [\-P\ \fIpidfile\fR] [\-S\ \fIport\fR] [\-L\ \fImessage\fR] [\-F\ \fIconfig\fR] [\-U\ \fIuamsv\fR] [\-m\ \fIumask\fR] +.HP \w'\fBafpd\fR\fB\fR\fBafpd\fR\fB\fR\ 'u +\fBafpd\fR\fB\fR [\-duptDTI] [\-f\ \fIdefaultvolumes\fR] [\-s\ \fIsystemvolumes\fR] [\-n\ \fInbpname\fR] [\-c\ \fImaxconnections\fR] [\-g\ \fIguest\fR] [\-P\ \fIpidfile\fR] [\-S\ \fIport\fR] [\-L\ \fImessage\fR] [\-F\ \fIconfigfile\fR] [\-U\ \fIuams\fR] [\-m\ \fIumask\fR] +.br +\fBafpd\fR\fB\fR \-v | \-V | \-h .SH "DESCRIPTION" .PP \fBafpd\fR @@ -86,6 +88,11 @@ Print version information and exit\&. Print verbose information and exit\&. .RE .PP +\-h +.RS 4 +Print help and exit\&. +.RE +.PP \-I .RS 4 Use a platform specific icon\&. (Equivalent to @@ -249,7 +256,7 @@ list of default volumes to mount list of volumes to offer all users .RE .PP -~/AppleVolumes +~/AppleVolumes, ~/\&.AppleVolumes .RS 4 user\'s list of volumes to mount .RE -- 2.39.2