Merge commit 'upstream/3.1.0'

Conflicts:
	client-src/selfcheck.c
	example/amanda.conf
	example/config.site
	man/amanda.conf.5
	man/xml-source/amanda.conf.5.xml

diff --cc changer-src/chg-mcutil.sh
Simple merge

diff --cc client-src/selfcheck.c
index 763ac323c535d8eb83c58d8a301122e5cc6b7b3e,ac5ed538c8cd29a7964b1e5680943156564cdf00..bbfcd67daad6506cbd224ef7dfe32685421425dd
--- 1/client-src/selfcheck.c
--- 2/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@@ -1108,7 -1151,8 +1151,9 @@@ check_overall(void
      check_space(AMANDA_DBGDIR, (off_t)64);    /* for amandad i/o */
  #endif
  
 +    check_space("/var/lib", (off_t)64);               /* for /var/lib/dumpdates writing */
+     check_space("/etc", (off_t)64);           /* for /etc/dumpdates writing */
+     }
  }
  
  static void

diff --cc example/amanda.conf.in
Simple merge

diff --cc gnulib/regenerate/regenerate
index 5669916877d155590ea73614af595138a9ddc032,6f42fa014782941304af48ccf11826cd02349de5..6f42fa014782941304af48ccf11826cd02349de5
mode 100644,100755..100644
--- 1/gnulib/regenerate/regenerate
--- 2/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate

diff --cc man/amanda.conf.5
index fcbb39e505b5644619d4a8cb949a7f85cb949f1d,595ed21073c7ae12aa2c494c08b6852c245223ed..bd2402bc2be05230ce4e71ee76efeb38212c3126
--- 1/man/amanda.conf.5
--- 2/man/amanda.conf.5
+++ b/man/amanda.conf.5
@@@ -1553,11 -1605,11 +1605,11 @@@ These options can set various propertie
  keyword append the values to the list of values for that property\&.
  .RE
  .PP
- \fBrecord\fR \fI boolean\fR
+ \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 --cc man/disklist.5
Simple merge

diff --cc man/entities/global.entities.in
index 58d8131b7cc1011a19be64c2a26c450533c01d0b,126e96b6891e51a107e0363adddf2d0022086425..0c76083f596153b24308a6629390095bfee2c57d
--- 1/man/entities/global.entities.in
--- 2/man/entities/global.entities.in
+++ b/man/entities/global.entities.in
@@@ -60,22 -60,45 +60,45 @@@
  <!ENTITY author.pby '<author><personname>Paul Yeatman</personname>
                    &affil.zmanda;
                    <email>pyeatman@zmanda.com</email></author>'>
+ <!ENTITY author.gsat '<author><personname>Satya Ganga</personname>
+                   &affil.zmanda;
+                   <email>gast@zmanda.com</email></author>'>
+ 
+ <!-- common option -->
+ 
+ <!ENTITY version.synopsis
+     '<group choice="opt"><option>--version</option></group>'>
+ 
+ <!ENTITY version.varlistentry
+   '<varlistentry>
+   <term><option>--version</option></term>
+   <listitem>
+ <para>Output version information</para>
+   </listitem>
+   </varlistentry>'>
  
+ <!ENTITY configoverride.synopsis
+     '<group rep="repeat" choice="opt"><arg choice="req"><option>-o</option> <replaceable>configoption</replaceable></arg></group>'>
  
- <!-- Amanda itself -->
- <!ENTITY A '<application><emphasis>Amanda</emphasis></application>'>
+ <!ENTITY configoverride.varlistentry
+   '<varlistentry>
+   <term><option>-o <replaceable>configoption</replaceable></option></term>
+   <listitem>
+ <para>See the "CONFIGURATION OVERRIDE" section in <manref name="amanda" vol="8"/>.</para>
+   </listitem>
+   </varlistentry>'>
  
  <!-- IDs for AMANDA files-->
- <!ENTITY amconf '<citerefentry><refentrytitle>amanda.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
- <!ENTITY amclientconf '<citerefentry><refentrytitle>amanda-client.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+ <!ENTITY amconf '<manref name="amanda.conf" vol="5"/>'>
+ <!ENTITY amclientconf '<manref name="amanda-client.conf" vol="5"/>'>
  <!ENTITY amandahosts '<filename>.amandahosts</filename>'>
- <!ENTITY disklist '<citerefentry><refentrytitle>disklist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+ <!ENTITY disklist '<manref name="disklist" vol="5"/>'>
  <!ENTITY amandapass '<filename>/etc/amandapass</filename>'>
  <!ENTITY inetdconf '<filename>/etc/inetd.conf</filename>'>
- <!ENTITY tapelist '<citerefentry><refentrytitle>tapelist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+ <!ENTITY tapelist '<manref name="tapelist" vol="5"/>'>
  
  <!-- IDs for files used by AMANDA-->
 -<!ENTITY dumpdates '<filename>/etc/dumpdates</filename>'>
 +<!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>
  
  <!-- IDs for AMANDA commands-->
  <!ENTITY amadmin ' <command>amadmin</command>'>

diff --cc man/xml-source/amanda.conf.5.xml
index f082edacd66c442c7d4fcbf0e61ecb635f1a5694,fe19c50def205d4a77771bd1247661f4c72ce18e..7d4fda62455205c5dceefa33dd1ce644c359b48f
--- 1/man/xml-source/amanda.conf.5.xml
--- 2/man/xml-source/amanda.conf.5.xml
+++ b/man/xml-source/amanda.conf.5.xml
@@@ -1868,11 -2070,11 +2070,11 @@@ the property to set, and the others con
    </varlistentry>
  
    <varlistentry>
-   <term><emphasis remap='B'>record</emphasis> <emphasis remap='I'> boolean</emphasis></term>
+   <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>

diff --cc man/xml-source/disklist.5.xml
Simple merge

diff --cc server-src/diskfile.h
Simple merge