merged from donkult

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

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 3d22f262ca9b2b5c79a7dcc0bad6d12ad4ec2ef6..57306c03f8f0bc2f48421cd151ce6f41a8d3a663 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -5,6 +5,9 @@
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;
 
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
+%aptverbatiment;
+
 ]>
 
 <refentry>
@@ -46,18 +49,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 +68,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 +84,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 +115,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>
@@ -444,6 +433,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