separate implementation from declaration of TryTo{Install,Remove}

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

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 3ac54fb0b8a42f055a0064023a55f15629e13f50..bcad5ee7fc857b7967514893f47ae2a46a6ab1c1 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>


@@ -136,12 +143,12 @@
 
  <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>
    <listitem>
  &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>
      </para>
    </listitem>
    <listitem>


@@ -165,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>