merged from debian-sid

[ntk/apt.git] / doc / apt-get.8.xml

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 4735dcd..abdec96 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -46,18 +46,10 @@
              </option>
       </arg>
       <arg>
-                 <option>-t=</option>
-                 <group choice='req'>
-                         <arg choice='plain'>
-                                 <replaceable>target_release_name</replaceable>
-                         </arg>
-                         <arg choice='plain'>
-                                 <replaceable>target_release_number_expression</replaceable>
-                         </arg>
-                         <arg choice='plain'>
-                                 <replaceable>target_release_codename</replaceable>
-                         </arg>
-                 </group>
+               <option>-t=</option>
+               <arg choice='plain'>
+                       <replaceable>target_release</replaceable>
+               </arg>
       </arg>
 
       <group choice="req">
@@ -73,10 +65,7 @@
                                                        =<replaceable>pkg_version_number</replaceable>
                                                </arg>
                                                <arg choice='plain'>
-                                                       /<replaceable>target_release_name</replaceable>
-                                               </arg>
-                                               <arg choice='plain'>
-                                                       /<replaceable>target_release_codename</replaceable>
+                                                       /<replaceable>target_release</replaceable>
                                                </arg>
                                        </group>
                                </arg>
@@ -92,10 +81,7 @@
                                                        =<replaceable>pkg_version_number</replaceable>
                                                </arg>
                                                <arg choice='plain'>
-                                                       /<replaceable>target_release_name</replaceable>
-                                               </arg>
-                                               <arg choice='plain'>
-                                                       /<replaceable>target_release_codename</replaceable>
+                                                       /<replaceable>target_release</replaceable>
                                                </arg>
                                        </group>
                                </arg>
@@ -126,7 +112,7 @@
    <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;,
-   &aptitude;, &synaptic;, &gnome-apt; and &wajig;.</para>
+   &aptitude;, &synaptic; 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>
@@ -263,7 +249,7 @@
      you will properly get another (newer, older or none) source version than
      the one you have installed or could install.</para>
 
-     <para>If the <option>--compile</option> options is specified
+     <para>If the <option>--compile</option> option is specified
      then the package will be compiled to a binary .deb using
      <command>dpkg-buildpackage</command>, if <option>--download-only</option>
      is specified then the source package will not be unpacked.</para>
@@ -333,8 +319,8 @@
      <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
      <listitem><para>Fix; attempt to correct a system with broken dependencies in            
      place. This option, when used with install/remove, can omit any packages
-     to permit APT to deduce a likely solution. Any Package that are specified
-     must completely correct the problem. The option is sometimes necessary when 
+     to permit APT to deduce a likely solution. If packages are specified,
+     these have to completely correct the problem. The option is sometimes necessary when 
      running APT for the first time; APT itself does not allow broken package 
      dependencies to exist on a system. It is possible that a system's 
      dependency structure can be so corrupt as to require manual intervention 
@@ -391,7 +377,7 @@
 
      <para>Simulate prints out
      a series of lines each one representing a dpkg operation, Configure (Conf),
-     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages
      and empty set of square brackets meaning breaks that are of no consequence
      (rare).</para></listitem>
      </varlistentry>
@@ -444,6 +430,13 @@
      Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>--only-upgrade</option></term>
+     <listitem><para>Do not install new packages; When used in conjunction with <literal>install</literal>,
+     <literal>only-upgrade</literal> will prevent packages on the command line
+     from being upgraded if they are not already installed.
+     Configuration Item: <literal>APT::Get::Only-Upgrade</literal>.</para></listitem>
+     </varlistentry>
+
      <varlistentry><term><option>--force-yes</option></term>
      <listitem><para>Force yes; This is a dangerous option that will cause apt to continue 
      without prompting if it is doing something potentially harmful. It 
@@ -466,7 +459,7 @@
      <varlistentry><term><option>--purge</option></term>
      <listitem><para>Use purge instead of remove for anything that would be removed.
      An asterisk ("*") will be displayed next to packages which are
-        scheduled to be purged. <option>remove --purge</option> is equivalent for
+        scheduled to be purged. <option>remove --purge</option> is equivalent to the
         <option>purge</option> command.
      Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
      </varlistentry>