Merge tag 'upstream/3.3.2'

[debian/amanda] / man / xml-source / disklist.5.xml

diff --git a/man/xml-source/disklist.5.xml b/man/xml-source/disklist.5.xml
index a4bd049c5751d1ada7b961fbd726ea88bfb3d467..352e09c6ce47a941749769f75d89dcb845673fa6 100644 (file)
--- a/man/xml-source/disklist.5.xml
+++ b/man/xml-source/disklist.5.xml
@@ -30,8 +30,25 @@
 <refsect1><title>DESCRIPTION</title>
 <para>The
 <emphasis remap='I'>disklist</emphasis>
-file determines which disks will be backed up by Amanda.
-The file usually contains one line per disk:</para>
+file determines which disks will be backed up by Amanda. The file contains
+<amkeyword>includefile</amkeyword> directive or disklist entry
+(<amkeyword>DLE</amkeyword>).</para>
+
+<variablelist remap='TP'>
+  <varlistentry>
+  <term><amkeyword>includefile</amkeyword> <amtype>string</amtype></term>
+  <listitem>
+<para>Default:
+<amdefault>no default</amdefault>.
+The name of a disklist file to include within the current file.
+Useful for sharing disklist among several configurations.
+Relative pathnames are relative to the configuration directory.
+</para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+
+<para>A <amkeyword>DLE</amkeyword> usually contains one line per disk:</para>
 
 <programlisting>
 <emphasis>hostname diskname</emphasis> [<emphasis>diskdevice</emphasis>] <emphasis>dumptype</emphasis> [<emphasis>spindle</emphasis> [<emphasis>interface</emphasis>] ]