Merge commit 'upstream/3.2.1'

diff --combined man/amanda.conf.5
index 2305f16ab9c88e11e93b2c6660c1d1d5e28b4fee,e326db218969718b21dd0ba457fc2880f5b8c9cd..6b071c2a877f9c19e890da44797f1ecf8aa52333
--- 1/man/amanda.conf.5
--- 2/man/amanda.conf.5
+++ b/man/amanda.conf.5
@@@ -2,12 -2,12 +2,12 @@@
  .\"     Title: amanda.conf
  .\"    Author: James da Silva <jds@amanda.org>
  .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
- .\"      Date: 10/18/2010
+ .\"      Date: 12/14/2010
  .\"    Manual: File formats and conventions
- .\"    Source: Amanda 3.2.0
+ .\"    Source: Amanda 3.2.1
  .\"  Language: English
  .\"
- .TH "AMANDA\&.CONF" "5" "10/18/2010" "Amanda 3\&.2\&.0" "File formats and conventions"
+ .TH "AMANDA\&.CONF" "5" "12/14/2010" "Amanda 3\&.2\&.1" "File formats and conventions"
  .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
@@@ -951,6 -951,12 +951,12 @@@ Default
  \fI0\fR\&. Debug level of the taper process
  .RE
  .PP
+ \fBdebug\-recovery\fR \fIint\fR
+ .RS 4
+ Default:
+ \fI1\fR\&. Debug level of all recovery process
+ .RE
+ .PP
  \fBflush\-threshold\-dumped\fR \fIint\fR
  .RS 4
  Default:
@@@ -1613,8 -1619,8 +1619,8 @@@ keyword append the values to the list o
  \fBrecord\fR \fIboolean\fR
  .RS 4
  Default:
 -\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
 -/etc/dumpdates
 +\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
 +/var/lib/dumpdates
  for DUMP or
  /usr/local/var/amanda/gnutar\-lists
  for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&.

diff --combined man/disklist.5
index f2bab787b5ad3a88fc15c00cdf739de1efca113e,652ba8df06528155ef9fe32c7b780116c051f6ab..4c7cb726ade651b277be3fb5f0fd563cb63b8bac
--- 1/man/disklist.5
--- 2/man/disklist.5
+++ b/man/disklist.5
@@@ -2,12 -2,12 +2,12 @@@
  .\"     Title: disklist
  .\"    Author: James da Silva <jds@amanda.org>
  .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
- .\"      Date: 10/18/2010
+ .\"      Date: 12/14/2010
  .\"    Manual: File formats and conventions
- .\"    Source: Amanda 3.2.0
+ .\"    Source: Amanda 3.2.1
  .\"  Language: English
  .\"
- .TH "DISKLIST" "5" "10/18/2010" "Amanda 3\&.2\&.0" "File formats and conventions"
+ .TH "DISKLIST" "5" "12/14/2010" "Amanda 3\&.2\&.1" "File formats and conventions"
  .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
@@@ -89,7 -89,7 +89,7 @@@ defined in th
  \fBamanda\&.conf\fR
  file\&.
  \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
 -/etc/dumpdates, the disk\'s relative priority, etc\&.
 +/var/lib/dumpdates, the disk\'s relative priority, etc\&.
  .RE
  .PP
  \fIspindle\fR

diff --combined man/xml-source/amanda.conf.5.xml
index 079dd60fc89b6f1b7a466afc3dcd9238b0a060cb,6964303686c760ddcf3e7d3d3bb331d6f7440eea..e1a26c9a965677623afaaca8e7190ddec0d84436
--- 1/man/xml-source/amanda.conf.5.xml
--- 2/man/xml-source/amanda.conf.5.xml
+++ b/man/xml-source/amanda.conf.5.xml
@@@ -1230,6 -1230,15 +1230,15 @@@ Debug level of the taper process</para
    </listitem>
    </varlistentry>
  
+   <varlistentry>
+   <term><amkeyword>debug-recovery</amkeyword> <amtype>int</amtype></term>
+   <listitem>
+ <para>Default:
+ <amdefault>1</amdefault>.
+ Debug level of all recovery process</para>
+   </listitem>
+   </varlistentry>
+ 
    <varlistentry>
    <term><amkeyword>flush-threshold-dumped</amkeyword> <amtype>int</amtype></term>
    <listitem>
@@@ -2085,8 -2094,8 +2094,8 @@@ the property to set, and the others con
    <term><amkeyword>record</amkeyword> <amtype>boolean</amtype></term>
    <listitem>
  <para>Default:
 -<amkeyword>yes</amkeyword>.
 -Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
 +<emphasis remap='I'>yes</emphasis>.
 +Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
  for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
  This is normally enabled for daily backups and turned off for periodic archival runs.</para>
    </listitem>