Merge remote branch 'netafp/master' into branch-allea

[netatalk.git] / man / man1 / dbd.1

diff --git a/man/man1/dbd.1 b/man/man1/dbd.1
index caff254846f426d85fd1f3505ece5c5265afcd2c..7d95ede2968154b977728a011a5e29056f520e13 100644 (file)
--- a/man/man1/dbd.1
+++ b/man/man1/dbd.1
@@ -3,11 +3,11 @@
 .\"    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
-.\"    Manual: Netatalk 2.2
-.\"    Source: Netatalk 2.2
+.\"    Manual: Netatalk 3.0
+.\"    Source: Netatalk 3.0
 .\"  Language: English
 .\"
-.TH "DBD" "1" "12 Oct 2010" "Netatalk 2.2" "Netatalk 2.2"
+.TH "DBD" "1" "12 Oct 2010" "Netatalk 3.0" "Netatalk 3.0"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,7 +19,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-dbd \- CNID database maintanance
+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
@@ -29,6 +29,10 @@ dbd \- CNID database maintanance
 can dump, scan, reindex and rebuild
 \fINetatalk\fR
 dbd CNID databases\&. It must be run with appropiate permissions i\&.e\&. as root\&.
+\fBdbd\fR
+\fB\-s|\-r\fR
+can be run on active volumes, but
+\fBdbd \-rf\fR, which wipes the db before rebuilding it, checks and enforces that the chosen volume is not in use\&.
 .SH "COMMANDS"
 .PP
 \-d
@@ -251,9 +255,9 @@ option\&. Implies
 .PP
 \-u
 .RS 4
-Prepare upgrade:
+Upgrade:
 .sp
-Before installing an upgraded version of Netatalk that is linked against a newer BerkeleyDB lib, run `dbd \-u \&.\&.\&.` from the OLD Netatalk pior to upgrading on all volumes\&. This removes the BerkleyDB environment\&. On exit cnid_dbd does this automatically, so normally calling dbd \-u should not be necessary !
+Opens the database which triggers any necessary upgrades, then closes and exits\&.
 .RE
 .SH "OPTIONS"
 .PP