merged from debian-sid

1 files changed, 24 insertions, 4 deletions

diff --git a/doc/apt.ent b/doc/apt.ent
index 44e303495..6594ba1b3 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -57,8 +57,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
@@ -141,14 +141,26 @@
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
-    
+
+<!ENTITY gnome-apt "<citerefentry>
+    <refentrytitle><command>gnome-apt</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY wajig "<citerefentry>
+    <refentrytitle><command>wajig</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+ 
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
    <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
-   <date>14 December 2003</date>
+   <date>28 October 2008</date>
    <productname>Linux</productname>
 
  </refentryinfo>
@@ -207,6 +219,12 @@
    <productname>Linux</productname>
 ">
 
+<!ENTITY apt-qapage "
+	<para>
+		<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
+	</para>
+">
+
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>
@@ -259,6 +277,8 @@
       <term><option>--option</option></term>
      <listitem><para>Set a Configuration Option; This will set an arbitrary
       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
+      <option>-o</option> and <option>--option</option> can be used multiple
+      times to set different options.
      </para>
      </listitem>
      </varlistentry>