document VERSION 2 (and 3) pre-install-pkgs hook interface

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

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 3ac54fb0b8a42f055a0064023a55f15629e13f50..29bf96751832bb997d84a3aa934476fa7cda4eeb 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" [
-
-<!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>
@@ -45,10 +41,10 @@
    <variablelist>
      <varlistentry><term><option>list</option></term>
      <listitem><para><literal>list</literal> is used to
-     display a list of packages. It supports shell pattern for matching
+     display a list of packages. It supports shell pattern for matching 
      package names and the following options:
-       <option>--installed</option>
-       <option>--upgradable</option>
+       <option>--installed</option>, 
+       <option>--upgradable</option>, 
        <option>--all-versions</option>
      are supported.
      </para></listitem>
@@ -105,8 +101,15 @@
      <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>
+
+     <varlistentry><term><option>full-upgrade</option></term>
+     <listitem><para><literal>full-upgrade</literal> performs the
+     function of upgrade but may also remove installed packages
+     if that is required in order to resolve a package conflict.
      </para></listitem>
      </varlistentry>
 
@@ -136,12 +139,12 @@
 
  <refsect1><title>Differences to &apt-get;</title>
  <para>The <command>apt</command> command is meant to be pleasant for
- end users and does not need to be backward compatilbe like
+ end users and does not need to be backward compatible like
  &apt-get;. Therefore some options are different:
  
  <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>
@@ -165,7 +168,7 @@
  </refsect1>
 
  <refsect1><title>See Also</title>
-   <para>&apt-get; &apt-cache;, &sources-list;,
+   <para>&apt-get;, &apt-cache;, &sources-list;,
    &apt-conf;, &apt-config;, 
    The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
  </refsect1>