Merge commit 'upstream/3.1.0'

[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 110d4402279a72191873d91dac40fc95a41e16e7..a4bd049c5751d1ada7b961fbd726ea88bfb3d467 100644 (file)
--- a/man/xml-source/disklist.5.xml
+++ b/man/xml-source/disklist.5.xml
@@ -3,7 +3,7 @@
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
 [
   <!-- entities files to use -->
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
 [
   <!-- entities files to use -->

-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
+  <!ENTITY % global_entities SYSTEM 'global.entities'>

   %global_entities;
 ]>
 
   %global_entities;
 ]>
 


@@ -18,7 +18,7 @@
 </refmeta>
 <refnamediv>
 <refname>disklist</refname>
 </refmeta>
 <refnamediv>
 <refname>disklist</refname>

-<refpurpose>List of partitions to back up for &A;</refpurpose>
+<refpurpose>List of partitions to back up for Amanda</refpurpose>

 </refnamediv>
 <refentryinfo>
 &author.jds;
 </refnamediv>
 <refentryinfo>
 &author.jds;


@@ -30,7 +30,7 @@
 <refsect1><title>DESCRIPTION</title>
 <para>The
 <emphasis remap='I'>disklist</emphasis>
 <refsect1><title>DESCRIPTION</title>
 <para>The
 <emphasis remap='I'>disklist</emphasis>

-file determines which disks will be backed up by &A;.
+file determines which disks will be backed up by Amanda.

 The file usually contains one line per disk:</para>
 
 <programlisting>
 The file usually contains one line per disk:</para>
 
 <programlisting>


@@ -48,7 +48,7 @@ The fields have the following meanings:</para>
 <para>The name of the host to be backed up.
 If
 <emphasis remap='B'>diskdevice</emphasis>
 <para>The name of the host to be backed up.
 If
 <emphasis remap='B'>diskdevice</emphasis>

-refers to a PC share, this is the host &A; will run the Samba
+refers to a PC share, this is the host Amanda will run the Samba

 <emphasis remap='B'>smbclient</emphasis> program on to back up the share.</para>
   </listitem>
   </varlistentry>
 <emphasis remap='B'>smbclient</emphasis> program on to back up the share.</para>
   </listitem>
   </varlistentry>


@@ -68,7 +68,7 @@ you must set a different
 <emphasis remap='B'>diskname</emphasis>
 for each entry. It's the
 <emphasis remap='B'>diskname</emphasis>
 <emphasis remap='B'>diskname</emphasis>
 for each entry. It's the
 <emphasis remap='B'>diskname</emphasis>

-that you use on the commandline for any &A; command.
+that you use on the commandline for any Amanda command.

 Look at the example/disklist file for example.</para>
   </listitem>
   </varlistentry>
 Look at the example/disklist file for example.</para>
   </listitem>
   </varlistentry>


@@ -112,7 +112,7 @@ file.
 specify backup related parameters,
 such as whether to compress the backups,
 whether to record backup results in
 specify backup related parameters,
 such as whether to compress the backups,
 whether to record backup results in

-<filename>/etc/dumpdates</filename>, the disk's relative priority, etc.</para>
+<filename>/var/lib/dumpdates</filename>, the disk's relative priority, etc.</para>

   </listitem>
   </varlistentry>
   <varlistentry>
   </listitem>
   </varlistentry>
   <varlistentry>


@@ -121,7 +121,7 @@ whether to record backup results in
 <para>Default:
 <option>-1</option>.
 A number used to balance backup load on a host.
 <para>Default:
 <option>-1</option>.
 A number used to balance backup load on a host.

-&A; will not run multiple backups at the same time
+Amanda will not run multiple backups at the same time

 on the same spindle, unless the spindle number is -1,
 which means there is no spindle restriction.</para>
   </listitem>
 on the same spindle, unless the spindle number is -1,
 which means there is no spindle restriction.</para>
   </listitem>


@@ -171,6 +171,11 @@ a new dumptype:</para>
 } [ <emphasis remap='I'>spindle</emphasis> [ <emphasis remap='I'>interface</emphasis> ] ]
 </programlisting>
 
 } [ <emphasis remap='I'>spindle</emphasis> [ <emphasis remap='I'>interface</emphasis> ] ]
 </programlisting>
 

+<para>The { must appear at the end of a line, and the } on its own line possibly followed by the spindle and interface.</para>

 </refsect1>
 
 </refsect1>
 

+<seealso>
+<manref name="amanda.conf" vol="5"/>
+</seealso>
+

 </refentry>
 </refentry>