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 02916c482bc3fc27a2d402c73e7adabddfcb78c9..f082edacd66c442c7d4fcbf0e61ecb635f1a5694 100644 (file)
--- a/man/xml-source/amanda.conf.5.xml
+++ b/man/xml-source/amanda.conf.5.xml
@@ -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>