Merge branch 'master' into squeeze

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

diff --git a/man/xml-source/amservice.8.xml b/man/xml-source/amservice.8.xml
index de3645665e15769c153231c000674d88930cb800..d0817572939539e9b0f3ff7b341e32765b653202 100644 (file)
--- a/man/xml-source/amservice.8.xml
+++ b/man/xml-source/amservice.8.xml
@@ -3,7 +3,7 @@
                    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
 [
   <!-- entities files to use -->
-  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
+  <!ENTITY % global_entities SYSTEM 'global.entities'>
   %global_entities;
 ]>
 
@@ -29,24 +29,24 @@
 <refsynopsisdiv>
 <cmdsynopsis>
   <command>amservice</command>    
+    <arg choice='opt'><arg choice='plain'>-f</arg><arg choice='plain'><replaceable>input_file</replaceable></arg><arg choice='opt'>-s</arg></arg>
+    &configoverride.synopsis;
     <arg choice='plain'><replaceable>hostname</replaceable></arg>
     <arg choice='plain'><replaceable>auth</replaceable></arg>
     <arg choice='plain'><replaceable>service</replaceable></arg>
-    <arg choice='opt'><arg choice='plain'>-f</arg><arg choice='plain'><replaceable>input_file</replaceable></arg></arg>
-    <arg choice='plain' rep='repeat'><group><arg choice='plain'>-o </arg><replaceable>configoption</replaceable></group></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 
 <refsect1><title>DESCRIPTION</title>
 <para><emphasis remap='B'>Amservice</emphasis>
-execute an &A; service on a client.
+execute an Amanda service on a client.
 It can be used without amanda server configuration (amanda.conf and disklist).
 It can be used to check communication between a server and a client.
 Amservice reads stdin to capture the REQ packet to send to the client.</para>
 <para>See the
-<citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-man page for more details about &A;.</para>
+<manref name="amanda" vol="8"/>
+man page for more details about Amanda.</para>
 </refsect1>
 
 <refsect1><title>OPTIONS</title>
@@ -78,19 +78,22 @@ The client must be configured with this auth.</para>
   </varlistentry>
 
   <varlistentry>
-  <term><emphasis remap='B'>-o</emphasis> <replaceable>configoption</replaceable></term>
+  <term><option>-s</option></term>
   <listitem>
-<para>See the "<emphasis remap='B'>CONFIGURATION OVERRIDE</emphasis>" section in <citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+<para>Redirect the first connected stream to stdin/stdout. The -f argument is required for the REQ packet, the REP packet is not printed on stdout.</para>
   </listitem>
   </varlistentry>
 
+  &configoverride.varlistentry;
+
 </variablelist>
 </refsect1>
 
 <refsect1><title>EXAMPLE</title>
 
 <para>The noop service is easy to execute because it does not require a REQ packet:</para>
-<programlisting>amservice hostname bsdtcp noop &lt; /dev/null</programlisting>
+<programlisting>amservice hostname bsdtcp noop &lt; /dev/null
+</programlisting>
 <para>The example executes the noop service on the client using bsdtcp auth.
 This is useful for debugging connection problems.
 It print an OPTIONS line upon success.</para>
@@ -111,11 +114,12 @@ is not authorized to execute the service.  An error message will be printed.
 </para>
 </refsect1>
 
-<refsect1><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>amanda</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>amcheck</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>amdump</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>amadmin</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
-</refsect1>
+<seealso>
+<manref name="amanda" vol="8"/>,
+<manref name="amcheck" vol="8"/>,
+<manref name="amdump" vol="8"/>,
+<manref name="amadmin" vol="8"/>
+</seealso>
+
 </refentry>