Import from XML

diff --git a/man/man1/dbd.1 b/man/man1/dbd.1
index 7d95ede2968154b977728a011a5e29056f520e13..1dfa1ee7174fef4cea8f51d556ed3817c13182cc 100644 (file)
--- a/man/man1/dbd.1
+++ b/man/man1/dbd.1
@@ -2,12 +2,12 @@
 .\"     Title: dbd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"     Title: dbd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>

-.\"      Date: 12 Oct 2010
+.\"      Date: 14 Sep 2012

 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
 .\"    Manual: Netatalk 3.0
 .\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"

-.TH "DBD" "1" "12 Oct 2010" "Netatalk 3.0" "Netatalk 3.0"
+.TH "DBD" "1" "14 Sep 2012" "Netatalk 3.0" "Netatalk 3.0"

 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------


@@ -22,7 +22,7 @@
 dbd \- CNID database maintenance
 .SH "SYNOPSIS"
 .HP \w'\fBdbd\fR\fB\fR\ 'u
 dbd \- CNID database maintenance
 .SH "SYNOPSIS"
 .HP \w'\fBdbd\fR\fB\fR\ 'u

-\fBdbd\fR\fB\fR [\-evx] {\-d\ [\-i]  | \-s\ [\-c|\-n]  | \-r\ [\-c|\-f]  | \-u} \fIvolumepath\fR
+\fBdbd\fR\fB\fR [\-evx] {\-d\ [\-i]  | \-s\ [\-c|\-n]  | \-r\ [\-c|\-f|\-C]  | \-u} \fIvolumepath\fR

 .SH "DESCRIPTION"
 .PP
 \fBdbd\fR
 .SH "DESCRIPTION"
 .PP
 \fBdbd\fR


@@ -45,207 +45,41 @@ Dump CNID database\&. With
 .RS 4
 Scan volume:
 .sp
 .RS 4
 Scan volume:
 .sp

+Compare CNIDs in database with volume, test if \&.AppleDouble directories exist, test if AppleDouble files exist, report orphaned AppleDouble files, report directories inside \&.AppleDouble directories, check name encoding, heck for orphaned CNIDs in database (requires
+\fB\-e\fR)\&.
+Options:
+.PP
+\-c

 .RS 4
 .RS 4

-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Compare CNIDs in database with volume
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Test if \&.AppleDouble directories exist
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Test if AppleDouble files exist
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Report orphaned AppleDouble files
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Report directories inside \&.AppleDouble directories
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Check name encoding by roundtripping, log on error
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Check for orphaned CNIDs in database (requires
-\fB\-e\fR)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Open and close adouble files
+Don\'t check \&.AppleDouble stuff, only check orphaned\&.

 .RE
 .RE

-.RS 4

 .PP
 .PP

-Options:
+\-n

 .RS 4
 .RS 4

-\fB\-c\fR
-Don\'t check \&.AppleDouble stuff, only check orphaned\&.
-\fB\-n\fR

 Don\'t open CNID database, skip CNID checks, only traverse filesystem
 .RE
 .RE
 .PP
 \-r
 .RS 4
 Don\'t open CNID database, skip CNID checks, only traverse filesystem
 .RE
 .RE
 .PP
 \-r
 .RS 4

-Rebuild volume\&. With
-\fB\-f\fR
-wipe database and rebuild from CNIIDs stored in AppleDouble files\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Sync CNIDSs from database with volume
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Ensure \&.AppleDouble directories exist
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Ensure AppleDouble files exist
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Delete orphaned AppleDouble files
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Report directories inside \&.AppleDouble directories
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Check name encoding by roundtripping, log on error
-.RE
+Rebuild volume:

 .sp
 .sp

+Sync CNIDSs from database with volume, ensure \&.AppleDouble directories exist, ensure AppleDouble files exist, delete orphaned AppleDouble files, report directories inside \&.AppleDouble directories, check name encoding by roundtripping, delete orphaned CNIDs in database (requires
+\fB\-e\fR)\&.
+Options:
+.PP
+\-C

 .RS 4
 .RS 4

-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Delete orphaned CNIDs in database (requires
-\fB\-e\fR)
+Converts volume from adouble:v2 to adouble:ea

 .RE
 .RE

-.sp
+.PP
+\-c

 .RS 4
 .RS 4

-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-Open and close adouble files
+Don\'t create \&.AppleDouble stuff, only cleanup orphaned\&.

 .RE
 .RE

-.RS 4

 .PP
 .PP

-Options:
+\-f

 .RS 4
 .RS 4

-\fB\-c\fR
-Don\'t create \&.AppleDouble stuff, only cleanup orphaned\&.
-
-\fB\-f\fR

 Wipe database and rebuild from IDs stored in AppleDouble files, only available for volumes without
 \fBnocnidcache\fR
 option\&. Implies
 Wipe database and rebuild from IDs stored in AppleDouble files, only available for volumes without
 \fBnocnidcache\fR
 option\&. Implies