- Added '(x)' to some referrings to manpages in apt-get manpage. Patch by

    Andre Felipe Machado. (Closes: #309893)
  - Added 'dist-upgrade' apt-get synopsis in apt-get manpage.
    (Closes: #323866)

3 files changed, 21 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index a1913daee..7d5a0efea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,10 @@ apt (0.7.17) unstable; urgency=low
       sources.list manpage, as they are already described under in the manpage.
     - Removed notice that ssh/rsh access cannot use password authentication
       from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894)
+    - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by
+      Andre Felipe Machado. (Closes: #309893)
+    - Added 'dist-upgrade' apt-get synopsis in apt-get manpage.
+      (Closes: #323866)
 
  -- Michael Vogt <mvo@debian.org>  Wed, 05 Nov 2008 13:14:56 +0100
 
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index c63011b2a..73bacf09b 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>30 October 2008</date>
+   <date>05 November 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -60,6 +60,7 @@
          <arg choice='plain'>update</arg>
          <arg choice='plain'>upgrade</arg>
          <arg choice='plain'>dselect-upgrade</arg>
+         <arg choice='plain'>dist-upgrade</arg>
          <arg choice='plain'>install 
 			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
 				<arg>
@@ -101,8 +102,8 @@
  <refsect1><title>Description</title>
    <para><command>apt-get</command> is the command-line tool for handling packages, and may be 
    considered the user's "back-end" to other tools using the APT
-   library.  Several "front-end" interfaces exist, such as dselect(8),
-   aptitude, synaptic, gnome-apt and wajig.</para>
+   library.  Several "front-end" interfaces exist, such as &dselect;,
+   &aptitude;, &synaptic;, &gnome-apt; and &wajig;.</para>
 
    <para>Unless the <option>-h</option>, or <option>--help</option> option is given, one of the
    commands below must be present.</para>
diff --git a/doc/apt.ent b/doc/apt.ent
index d0bfaba56..6594ba1b3 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -141,7 +141,19 @@
     <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>