Merge commit 'upstream/2.6.1p2'

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

diff --git a/man/xml-source/amanda.conf.5.xml b/man/xml-source/amanda.conf.5.xml
index 79a7f059d37a13b77d5d095240ef3f3f12db3a9a..f082edacd66c442c7d4fcbf0e61ecb635f1a5694 100644 (file)
--- a/man/xml-source/amanda.conf.5.xml
+++ b/man/xml-source/amanda.conf.5.xml
@@ -1872,7 +1872,7 @@ the property to set, and the others contains its values.
   <listitem>
 <para>Default:
 <emphasis remap='I'>yes</emphasis>.
-Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
+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>
@@ -1893,6 +1893,14 @@ level 1 incrementals in this configuration; this is probably a bug.</para>
 <para>Default:
 <emphasis remap='I'>no</emphasis>. If <emphasis remap='I'>true</emphasis> and
 <emphasis remap='B'>planner</emphasis> has scheduled an incremental backup, these disks will be skipped.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><emphasis remap='B'>ssh_keys</emphasis> <emphasis remap='I'> string</emphasis></term>
+  <listitem>
+<para>Default:
+<emphasis remap='I'>No default</emphasis>.
+The key file the ssh auth will use, it must be the private key. If this parameter is not specified, then the default ssh key will be used.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
@@ -2107,16 +2115,13 @@ convert it to kbytes using the device density.</para>
   <term><emphasis remap='B'>length</emphasis> <emphasis remap='I'> int</emphasis></term>
   <listitem>
 <para>Default:
-<emphasis remap='I'>2000 kbytes</emphasis>. How much data will fit on a tape.</para>
+<emphasis remap='I'>2000 kbytes</emphasis>. How much data will fit on a tape, expressed in kbytes.</para>
 
 <para>Note that this value is only used by &A; to schedule which backups will be run.
 Once the backups start, &A; will continue to write to a tape until it gets an error, 
 regardless of what value is entered for <emphasis remap='B'>length</emphasis>
-(but see the section OUTPUT DRIVERS in the 
-<citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry> 
-manpage for exceptions).
+(but see <citerefentry><refentrytitle>amanda-devices</refentrytitle><manvolnum>7</manvolnum></citerefentry> for exceptions).
  </para>
-<para>The default unit is bytes if it is not specified.</para>
   </listitem>
   </varlistentry>
 
@@ -2125,9 +2130,7 @@ manpage for exceptions).
 <listitem>
 <para>Default:
 <emphasis remap='I'>32 kbytes</emphasis>.
-How much data will be written in each tape record.  This is equivalent to the <emphasis remap="I">BLOCK_SIZE</emphasis> device property.
-</para>
-<para>The default unit is Kbytes if it is not specified.</para>
+How much data will be written in each tape record, expressed in kbytes.  This is similar to the <emphasis remap="I">BLOCK_SIZE</emphasis> device property, but if the blocksize is not a multiple of 1024 bytes, then this parameter cannot be used to specify it, and the property must be used instead.</para>
   </listitem>
   </varlistentry>
 <varlistentry>
@@ -2527,10 +2530,6 @@ define changer <emphasis remap='I'>name</emphasis> {
 device. The remaining parameters are specific to the changer type selected.
 </para>
 
-<para>
-TODO: more detail here once it's known
-</para>
-
 </refsect1>
 
 <refsect1><title>SEE ALSO</title>