Merge remote-tracking branch 'mvo/bugfix/apt-list-rc-pkgs' into debian/sid

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

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 91e22b1efd501c548ccec7784188c3e8d1dadf75..85e7276bf6549d69ce82adff019b457455325611 100644 (file)
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -45,10 +45,10 @@
    <variablelist>
      <varlistentry><term><option>list</option></term>
      <listitem><para><literal>list</literal> is used to
    <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:
      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>
        <option>--all-versions</option>
      are supported.
      </para></listitem>


@@ -110,6 +110,13 @@
      </para></listitem>
      </varlistentry>
 
      </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>
+

 
    </variablelist>
  </refsect1>
 
    </variablelist>
  </refsect1>


@@ -124,11 +131,19 @@
    </variablelist>
  </refsect1>
 
    </variablelist>
  </refsect1>
 

-</refsect1>
+ <refsect1><title>Script usage</title>
+  <para>
+   The &apt; commandline is designed as a end-user tool and it may
+   change the output between versions. While it tries to not break
+   backward compatibility there is no guarantee for it either.
+   All features of &apt; are available in  &apt-cache; and &apt-get;
+   via APT options. Please prefer using these commands in your scripts.
+  </para>
+ </refsect1>

 
  <refsect1><title>Differences to &apt-get;</title>
  <para>The <command>apt</command> command is meant to be pleasant for
 
  <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>
  &apt-get;. Therefore some options are different:
  
  <itemizedlist>


@@ -157,7 +172,7 @@
  </refsect1>
 
  <refsect1><title>See Also</title>
  </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>
    &apt-conf;, &apt-config;, 
    The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para>
  </refsect1>