Merge tag 'upstream/3.3.3'

[debian/amanda] / man / amanda.conf.5

diff --git a/man/amanda.conf.5 b/man/amanda.conf.5
index a909f2047ffec4bf161f7ea602c8fca6c35223fd..111c0e074c97c8ff660ac3b015e0de3f25cc4eb7 100644 (file)
--- a/man/amanda.conf.5
+++ b/man/amanda.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: amanda.conf
 .\"    Author: James da Silva <jds@amanda.org>
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/25/2012
+.\"      Date: 01/10/2013
 .\"    Manual: File formats and conventions
-.\"    Source: Amanda 3.3.2
+.\"    Source: Amanda 3.3.3
 .\"  Language: English
 .\"
-.TH "AMANDA\&.CONF" "5" "07/25/2012" "Amanda 3\&.3\&.2" "File formats and conventions"
+.TH "AMANDA\&.CONF" "5" "01/10/2013" "Amanda 3\&.3\&.3" "File formats and conventions"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -287,6 +287,28 @@ Never send an email\&.
 .RE
 .RE
 .PP
+\fBreport\-use\-media\fR \fIboolean\fR
+.RS 4
+Default:
+\fITrue\fR
+if
+\fBmax\-dle\-by\-volume\fR
+is not set,
+\fIFalse\fR
+if it is set\&. If the reporter must print the list of media used in the run\&.
+.RE
+.PP
+\fBreport\-next\-media\fR \fIboolean\fR
+.RS 4
+Default:
+\fITrue\fR
+if
+\fBmax\-dle\-by\-volume\fR
+is not set,
+\fIFalse\fR
+if it is set\&. If the reporter must print the list of media expected for the next run\&.
+.RE
+.PP
 \fBmax\-dle\-by\-volume\fR \fIint\fR
 .RS 4
 Default:
@@ -1967,9 +1989,7 @@ The default unit is Kbytes if it is not specified\&.
 .PP
 \fBpart\-size\fR \fIint\fR
 .RS 4
-Default: none\&. This is the size (in KB if no units are specified) of each split part written to the volume\&. It is reduced to
-\fBpart\-cache\-max\-size\fR
-when part caching is required\&. If this is set to zero, then no splitting will take place; in this case, some devices can span dumps from volume to volume, while others will cause the entire dump to fail if they encounter end\-of\-medium before the dump is complete\&. See "Dump Splitting Configuration" below\&.
+If this is set to zero (default), then no splitting will take place, and the entire dump will fail, if end\-of\-medium is encountered before the dump is complete, unless the device property LEOM is true, and the device can detect EOM\&. See "Dump Splitting Configuration" below\&.
 .RE
 .PP
 \fBpart\-cache\-type\fR [ \fBnone\fR | \fBdisk\fR | \fBmemory\fR ]