add a changelog entry

[debian/amanda] / man / amflush.8

diff --git a/man/amflush.8 b/man/amflush.8
index 7a7c73c929b4622ed840f082a7494cf5ed597bf7..2cec85aff1ed7c8510022b67ef210eabe91c4e35 100644 (file)
--- a/man/amflush.8
+++ b/man/amflush.8
@@ -2,12 +2,12 @@
 .\"     Title: amflush
 .\"    Author: James da Silva <jds@amanda.org>
 .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
 .\"     Title: amflush
 .\"    Author: James da Silva <jds@amanda.org>
 .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>

-.\"      Date: 06/01/2010
+.\"      Date: 10/18/2010

 .\"    Manual: System Administration Commands
 .\"    Manual: System Administration Commands

-.\"    Source: Amanda 3.1.0
+.\"    Source: Amanda 3.2.0

 .\"  Language: English
 .\"
 .\"  Language: English
 .\"

-.TH "AMFLUSH" "8" "06/01/2010" "Amanda 3\&.1\&.0" "System Administration Commands"
+.TH "AMFLUSH" "8" "10/18/2010" "Amanda 3\&.2\&.0" "System Administration Commands"

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


@@ -22,17 +22,20 @@
 amflush \- flush Amanda backup files from holding disk to tape
 .SH "SYNOPSIS"
 .HP \w'\fBamflush\fR\ 'u
 amflush \- flush Amanda backup files from holding disk to tape
 .SH "SYNOPSIS"
 .HP \w'\fBamflush\fR\ 'u

-\fBamflush\fR [\-b] [\-f] [\-s] [\-D\ \fIdatestamp\fR] \fIconfig\fR [\fIhost\fR\ [\fIdisk\fR...]...] [{\fB\-o\fR\ \fIconfigoption\fR}...]
+\fBamflush\fR [\-b] [\-f] [\-s] [\-D\ \fIdatestamp\fR] \fIconfig\fR [\fIhost\fR\ [\fIdisk\fR...]...] [\fB\-o\fR\ \fIconfigoption\fR...]

 .SH "DESCRIPTION"
 .PP
 \fBAmflush\fR
 writes Amanda backups from the holding disks to tape, and updates the Amanda info database and
 \fBtapelist\fR(5)
 .SH "DESCRIPTION"
 .PP
 \fBAmflush\fR
 writes Amanda backups from the holding disks to tape, and updates the Amanda info database and
 \fBtapelist\fR(5)

-accordingly\&. Backups may stay in a holding disk when something is wrong with the tape at the time
+accordingly\&. It is similar to amdump, but does not perform any backup operations on Amanda clients\&. Backups may stay in a holding disk when something is wrong with the tape at the time

 \fBamdump\fR
 is run\&. When this happens, the problem must be corrected and
 \fBamflush\fR
 run by hand\&.
 \fBamdump\fR
 is run\&. When this happens, the problem must be corrected and
 \fBamflush\fR
 run by hand\&.

+.PP
+The command optionally takes a set of DLE specifications (see
+\fBamanda-match\fR(7)) to narrow the DLEs for which dumps will be flushed\&. All dumps in holding are flushed if no expressions are given\&.

 .SH "OPTIONS"
 .PP
 \fB\-b\fR
 .SH "OPTIONS"
 .PP
 \fB\-b\fR


@@ -66,16 +69,17 @@ option\&.
 .PP
 \fB\-D datestamp\fR
 .RS 4
 .PP
 \fB\-D datestamp\fR
 .RS 4

-specify a datestamp expression you want to flush, see the "DATESTAMP EXPRESSION" section of
-\fBamanda\fR(8)
-for a description\&.
+specify a datestamp expression you want to flush; see
+\fBamanda-match\fR(7)
+for details on the format of this expression\&.

 \fB\-D 20001225\-7\fR
 will flush all dumps from 25 december 2000 to 27 december 2000\&.
 .RE
 .PP
 \fIhost\fR [\fIdisk\fR]*
 .RS 4
 \fB\-D 20001225\-7\fR
 will flush all dumps from 25 december 2000 to 27 december 2000\&.
 .RE
 .PP
 \fIhost\fR [\fIdisk\fR]*
 .RS 4

-Specify the host and disk on which the command will work\&.
+Specify the host and disk on which the command will work \-\- see the description of DLE specifications in
+\fBamanda-match\fR(7)\&.

 .RE
 .PP
 \fB\-o \fR\fB\fIconfigoption\fR\fR
 .RE
 .PP
 \fB\-o \fR\fB\fIconfigoption\fR\fR


@@ -146,7 +150,8 @@ The exit code of \fBamflush\fR is the ORed value of:
 .SH "SEE ALSO"
 .PP
 \fBamanda\fR(8),
 .SH "SEE ALSO"
 .PP
 \fBamanda\fR(8),

-\fBamdump\fR(8)
+\fBamdump\fR(8),
+\fBamanda-match\fR(7)

 .PP
 The Amanda Wiki:
 : http://wiki.zmanda.com/
 .PP
 The Amanda Wiki:
 : http://wiki.zmanda.com/