X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=man%2Fxml-source%2Famfetchdump.8.xml;h=e971eddfb354e8dbcd7a6d9ca37aafb4d97ff5d5;hb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;hp=a1fcdbe95c587e8474dae4ef5b2ffa930e35516f;hpb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;p=debian%2Famanda

diff --git a/man/xml-source/amfetchdump.8.xml b/man/xml-source/amfetchdump.8.xml
index a1fcdbe..e971edd 100644
--- a/man/xml-source/amfetchdump.8.xml
+++ b/man/xml-source/amfetchdump.8.xml
@@ -23,8 +23,7 @@
   <command>amfetchdump</command>
     <arg choice='opt'>-pcClawns</arg>
     <arg choice='opt'>-d <replaceable>device</replaceable></arg>
-    <arg choice='opt'>-o <replaceable>directory</replaceable></arg>
-    <arg choice='opt'>-i <replaceable>logfile</replaceable></arg>
+    <arg choice='opt'>-O <replaceable>directory</replaceable></arg>
     <arg choice='opt'>-b <replaceable>blocksize</replaceable></arg>
     <arg choice='plain'><replaceable>config</replaceable></arg>
     <arg choice='plain'><replaceable>hostname</replaceable></arg>
@@ -41,6 +40,7 @@
         </arg>
       </arg>
     </arg>
+    <arg choice='plain' rep='repeat'><group><arg choice='plain'>-o </arg><replaceable>configoption</replaceable></group></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -94,7 +94,7 @@ facility).</para></listitem>
 <listitem><para> Restore from this tape device instead of the default.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><option>-o</option>
+    <term><option>-O</option>
     <replaceable>directory</replaceable></term>
 <listitem><para>Output restored files to this directory, instead of to the
     current working directory.</para></listitem>
@@ -121,11 +121,6 @@ restoring.</para></listitem>
 <listitem><para>Assume that all tapes are already available, via tape changer or
 otherwise, instead of prompting the operator to ensure that all tapes
 are loaded.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><option>-i</option> <replaceable>filename</replaceable></term>
-<listitem><para>Generate an inventory of all dumps &quot;seen&quot; on the
-tapes we search, for later use as a log.</para></listitem>
   </varlistentry>
   <varlistentry>
     <term><option>-w</option></term>
@@ -137,8 +132,9 @@ option disables the appending behavior, and instead restores each
 piece as an individual file and reassembles them only after all have
 been restored.</para>
 
-<note>This requires at least double the size of your dump in free
-disk space, in order to build the final assembled dumpfile.</note>
+<note><para>This requires at least double the size of your dump in free
+disk space, in order to build the final assembled dumpfile.</para>
+</note>
 
 <para>This behavior is implicitly invoked in circumstances where knowing the
 location of all dumps on tape in advance is not possible, such as when
@@ -163,6 +159,15 @@ operation.</para></listitem>
     value will usually be autodetected, and should not normally need
     to be set.</para></listitem>
   </varlistentry>
+
+  <varlistentry>
+  <term><emphasis remap='B'>-o</emphasis> <replaceable>configoption</replaceable></term>
+  <listitem>
+<para>See the "<emphasis remap='B'>CONFIGURATION OVERRIDE</emphasis>"
+ section in <citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+  </listitem>
+  </varlistentry>
+
 </variablelist>
 </refsect1>
 
@@ -185,30 +190,10 @@ automatically extract the dump.</para>
 $ amfetchdump -p SetA vanya /home 20051020 | gtar -xvpf -
 </literallayout> <!-- .fi -->
 
-<para>In a situation where all of our dump logs have been wiped out,
-we could also use amfetchdump to inventory our tapes and recreate an
-imitation of those logs, which we'll send to <emphasis
-remap="I">stdout</emphasis> for casual perusal.
-<!-- .RS -->
-<literallayout remap='.nf'>
-$ amfetchdump -i - SetA
-</literallayout> <!-- .fi -->
-</para>
-
-<para>Note that you can specify a restore while in inventory mode, and
-<command>amfetchdump</command> will continue searching for more dumps
-from this host even after successfully restoring a dump, inventorying
-all the while. If your backup searcher has been trashed, this is a
-handy way to recover what you have.
-<!-- .RS -->
-<literallayout remap='.nf'>
-$ amfetchdump -i /var/amanda/log SetA backupserver
-</literallayout> <!-- .fi -->
-</para>
 </refsect1>
 
 <refsect1><title>CAVEATS</title>
-<command>Amfetchdump</command> is dependent on accessing your server's config,
+<para><command>Amfetchdump</command> is dependent on accessing your server's config,
 tape changer, and (normally) dump logs. As such, it's not necessarily
 the most useful tool when those have all been wiped out and you
 desperately need to pull things from your tape. Pains have been taken
@@ -217,7 +202,7 @@ restores, look to
 <citerefentry><refentrytitle>amrestore</refentrytitle><manvolnum>8</manvolnum></citerefentry>
 or
 <citerefentry><refentrytitle>dd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-instead.
+instead.</para>
 </refsect1>
 
 <refsect1><title>AUTHOR</title>
@@ -229,8 +214,10 @@ instead.
 <para><citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amadmin</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amrestore</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>tar</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-<citerefentry><refentrytitle>restore</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
+<citerefentry><refentrytitle>tar</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>restore</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>http://wiki.zmanda.com</refentrytitle></citerefentry>
+</para>
 </refsect1>
 </refentry>