Make auto-remove and auto-clean aliases for the versions without -

[apt.git] / doc / apt.8.xml

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 85e7276bf6549d69ce82adff019b457455325611..e00b6417af2dda826d349170462c210327ed1a70 100644 (file)
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [

-
-<!ENTITY % aptent SYSTEM "apt.ent">
-%aptent;
-
-<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
-%aptverbatiment;
-
+<!ENTITY % aptent SYSTEM "apt.ent"> %aptent;
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment;
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor;

 ]>
 
 <refentry>
 ]>
 
 <refentry>


@@ -48,7 +44,8 @@
      display a list of packages. It supports shell pattern for matching 
      package names and the following options:
        <option>--installed</option>, 
      display a list of packages. It supports shell pattern for matching 
      package names and the following options:
        <option>--installed</option>, 

-       <option>--upgradable</option>, 
+       <option>--upgradable</option>,
+       <option>--upgradeable</option>,

        <option>--all-versions</option>
      are supported.
      </para></listitem>
        <option>--all-versions</option>
      are supported.
      </para></listitem>


@@ -105,8 +102,8 @@
      <listitem><para><literal>upgrade</literal> is used to install the
      newest versions of all packages currently installed on the system
      from the sources enumerated in
      <listitem><para><literal>upgrade</literal> is used to install the
      newest versions of all packages currently installed on the system
      from the sources enumerated in

-     <filename>/etc/apt/sources.list</filename>. New package will be
-     installed, but existing package will never removed.
+     <filename>/etc/apt/sources.list</filename>. New packages will be
+     installed, but existing packages will never be removed.

      </para></listitem>
      </varlistentry>
 
      </para></listitem>
      </varlistentry>
 


@@ -148,7 +145,7 @@
  
  <itemizedlist>
    <listitem>
  
  <itemizedlist>
    <listitem>

-     <para>The option <literal>DPkgPM::Progress-Fancy</literal> is enabled.
+     <para>The option <literal>DPkg::Progress-Fancy</literal> is enabled.

      </para>
    </listitem>
    <listitem>
      </para>
    </listitem>
    <listitem>