Merge commit 'upstream/3.1.0'

[debian/amanda] / man / entities / global.entities.in

diff --git a/man/entities/global.entities.in b/man/entities/global.entities.in
index 58d8131b7cc1011a19be64c2a26c450533c01d0b..0c76083f596153b24308a6629390095bfee2c57d 100644 (file)
--- a/man/entities/global.entities.in
+++ b/man/entities/global.entities.in
@@ -60,19 +60,42 @@
 <!ENTITY author.pby '<author><personname>Paul Yeatman</personname>
                    &affil.zmanda;
                    <email>pyeatman@zmanda.com</email></author>'>
+<!ENTITY author.gsat '<author><personname>Satya Ganga</personname>
+                   &affil.zmanda;
+                   <email>gast@zmanda.com</email></author>'>
+
+<!-- common option -->
+
+<!ENTITY version.synopsis
+    '<group choice="opt"><option>--version</option></group>'>
+
+<!ENTITY version.varlistentry
+  '<varlistentry>
+  <term><option>--version</option></term>
+  <listitem>
+<para>Output version information</para>
+  </listitem>
+  </varlistentry>'>
 
+<!ENTITY configoverride.synopsis
+    '<group rep="repeat" choice="opt"><arg choice="req"><option>-o</option> <replaceable>configoption</replaceable></arg></group>'>
 
-<!-- Amanda itself -->
-<!ENTITY A '<application><emphasis>Amanda</emphasis></application>'>
+<!ENTITY configoverride.varlistentry
+  '<varlistentry>
+  <term><option>-o <replaceable>configoption</replaceable></option></term>
+  <listitem>
+<para>See the "CONFIGURATION OVERRIDE" section in <manref name="amanda" vol="8"/>.</para>
+  </listitem>
+  </varlistentry>'>
 
 <!-- IDs for AMANDA files-->
-<!ENTITY amconf '<citerefentry><refentrytitle>amanda.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
-<!ENTITY amclientconf '<citerefentry><refentrytitle>amanda-client.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+<!ENTITY amconf '<manref name="amanda.conf" vol="5"/>'>
+<!ENTITY amclientconf '<manref name="amanda-client.conf" vol="5"/>'>
 <!ENTITY amandahosts '<filename>.amandahosts</filename>'>
-<!ENTITY disklist '<citerefentry><refentrytitle>disklist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+<!ENTITY disklist '<manref name="disklist" vol="5"/>'>
 <!ENTITY amandapass '<filename>/etc/amandapass</filename>'>
 <!ENTITY inetdconf '<filename>/etc/inetd.conf</filename>'>
-<!ENTITY tapelist '<citerefentry><refentrytitle>tapelist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
+<!ENTITY tapelist '<manref name="tapelist" vol="5"/>'>
 
 <!-- IDs for files used by AMANDA-->
 <!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>