Imported Upstream version 2.5.1

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

diff --git a/man/xml-source/amanda.8.xml b/man/xml-source/amanda.8.xml
index 493bb74797296cbce4722f125b71ac5f8f637cc1..c4b161cc22baa015ee3575aaad2a64e00785aa6e 100644 (file)
--- a/man/xml-source/amanda.8.xml
+++ b/man/xml-source/amanda.8.xml
@@ -629,7 +629,7 @@ a new dumptype:</para>
 <programlisting>
 <emphasis remap='I'>hostname diskname</emphasis> [ <emphasis remap='I'>diskdevice</emphasis> ] {
   normal
-  holdingdisk no
+  holdingdisk never
 } [ <emphasis remap='I'>spindle</emphasis> [ <emphasis remap='I'>interface</emphasis> ] ]
 </programlisting>
 
@@ -871,7 +871,9 @@ file is:</para>
 <para><emphasis remap='I'>hostname</emphasis>
 [
 <emphasis remap='I'>username</emphasis>
-]</para>
+[
+<emphasis remap='I'>service</emphasis>
+]*]</para>
 
 <para>If
 <emphasis remap='I'>username</emphasis>
@@ -882,6 +884,15 @@ i.e. the user listed in the
 or
 <emphasis remap='B'>xinetd</emphasis>
 configuration file.</para>
+<para>The <emphasis remap='I'>service</emphasis> is a list of the service the client is authorized to execute:
+<emphasis remap='B'>amdump</emphasis>,
+<emphasis remap='B'>noop</emphasis>,
+<emphasis remap='B'>selfcheck</emphasis>,
+<emphasis remap='B'>sendsize</emphasis>,
+<emphasis remap='B'>sendbackup</emphasis>,
+<emphasis remap='B'>amindexd</emphasis>,
+<emphasis remap='B'>amidxtaped</emphasis>.
+<emphasis remap='B'>amdump</emphasis> is a shortcut for "noop selfcheck sendsize sendbackup"</para>
   </listitem>
   </varlistentry>
   <varlistentry>
@@ -908,10 +919,11 @@ For instance:</para>
 
 <programlisting>
   //some-pc/home normalpw
-  //another-pc/disk otheruser%otherpw</programlisting>
+  //another-pc/disk otheruser%otherpw
+</programlisting>
 
-<para>With clear text passwords, this file should obviously be tightly protected.
-It only needs to be readable by the &A;-user on the Samba server.</para>
+With clear text passwords, this file should obviously be tightly protected.
+It only needs to be readable by the &A;-user on the Samba server.
 
 <para>You can find further information in the
 <emphasis remap='B'>docs/SAMBA</emphasis>
@@ -1025,6 +1037,18 @@ Leading ^ is removed. Trailing $ forces an exact match.</para>
 </informaltable>
 <para/>
 
+</refsect1>
+
+<refsect1><title>CONFIGURATION OVERWRITE</title>
+<para>Most command allow to overwrite any configuration parameter on
+the command line with the -o option.</para>
+<para>-o NAME=value</para>
+<para>eg. -o runtapes=2</para>
+<para>eg. -o DUMPTYPE:no-compress:compress="server fast"</para>
+<para>eg. -o TAPETYPE:HP-DAT:length=2000m</para>
+<para>eg. -o INTERFACE:local:use="2000 kbps"</para>
+
+
 </refsect1>
 
 <refsect1><title>AUTHOR</title>
@@ -1036,6 +1060,7 @@ Leading ^ is removed. Trailing $ forces an exact match.</para>
 <para>
 <citerefentry><refentrytitle>amadmin</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amanda.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>amanda-client.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amcheck</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amcheckdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>amcleanup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,