Merge commit 'upstream/3.3.0'

[debian/amanda] / man / xml-source / amrecover.8.xml

diff --git a/man/xml-source/amrecover.8.xml b/man/xml-source/amrecover.8.xml
index 2e3f26b980df586cd8310c8f8cbf4728ba2597f5..bc760e0518c86b65c595ba7a559c5ab8ce9f14c1 100644 (file)
--- a/man/xml-source/amrecover.8.xml
+++ b/man/xml-source/amrecover.8.xml
@@ -30,11 +30,12 @@
 <refsynopsisdiv>
 <cmdsynopsis>
   <command>amrecover</command>    
-    <arg choice='opt'>-C <replaceable>config</replaceable></arg>
     <arg choice='opt'>-s <replaceable>index-server</replaceable></arg>
     <arg choice='opt'>-t <replaceable>tape-server</replaceable></arg>
     <arg choice='opt'>-d <replaceable>tape-device</replaceable></arg>
-    <arg choice='plain' rep='repeat'><group><arg choice='plain'>-o </arg><replaceable>configoption</replaceable></group></arg>
+    <arg choice='opt'>-h <replaceable>hostname</replaceable></arg>
+    &configoverride.synopsis;
+    <arg choice='opt'>-C <replaceable>config</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -89,6 +90,12 @@ client-custom-compressed tapes.</para>
 <para>Tape device to use on the tape server host.</para>
   </listitem>
   </varlistentry>
+  <varlistentry>
+  <term><option>-h hostname</option></term>
+  <listitem>
+<para>Hostname to begin restoring; defaults to the system's hostname.</para>
+  </listitem>
+  </varlistentry>
 
   <varlistentry>
   <term><emphasis remap='B'>-o</emphasis> <replaceable>clientconfigoption</replaceable></term>
@@ -101,6 +108,12 @@ client-custom-compressed tapes.</para>
 </variablelist>
 </refsect1>
 
+<refsect1><title>AUTH</title>
+<para>The default <emphasis remap='B'>auth</emphasis> is 'BSDTCP', you can set
+a different auth in the <emphasis remap='B'>amanda-client.conf</emphasis> file
+or by specifying the '-oauth=bsd' command line argument.</para>
+</refsect1>
+
 <refsect1><title>COMMANDS</title>
 <para><emphasis remap='B'>Amrecover</emphasis>
 connects to the index server and then presents a command line prompt.
@@ -232,7 +245,7 @@ If the tape device is omitted, the default is used.</para>
 
 <para>If you want amrecover to use your changer, the 
 <emphasis remap='I'>tapedev</emphasis>
-must be equal to the amrecover_changer setting on the server.</para>
+must be equal to the <amkeyword>amrecover-changer</amkeyword> setting on the server.</para>
 
 <para>Since device names contain colons, you must always specify the hostname.</para>