[apt-pkg] allow also codenames for specifying a release

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

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 325f1964d6fd0833fb41c0bb11cec277a278a2bb..c63b2a6c6364dc65a25e7d867a1ded13984efbf2 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>05 November 2008</date>
+   <date>08 November 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -33,7 +33,7 @@
  <refsynopsisdiv>
    <cmdsynopsis>
       <command>apt-get</command>
-      <arg><option>-vsqdyfmubV</option></arg>
+      <arg><option>-sqdyfmubV</option></arg>
       <arg>
              <option>-o=
                          <replaceable>config_string</replaceable>
@@ -53,6 +53,9 @@
                          <arg choice='plain'>
                                  <replaceable>target_release_number_expression</replaceable>
                          </arg>
+                         <arg choice='plain'>
+                                 <replaceable>target_release_codename</replaceable>
+                         </arg>
                  </group>
       </arg>
 
@@ -71,6 +74,9 @@
                                                <arg choice='plain'>
                                                        /<replaceable>target_release_name</replaceable>
                                                </arg>
+                                               <arg choice='plain'>
+                                                       /<replaceable>target_release_codename</replaceable>
+                                               </arg>
                                        </group>
                                </arg>
                         </arg>
@@ -89,6 +95,12 @@
          <arg choice='plain'>clean</arg>
          <arg choice='plain'>autoclean</arg>
          <arg choice='plain'>autoremove</arg>
+                <arg choice='plain'>
+                        <group choice='req'>
+                               <arg choice='plain'>-v</arg>
+                               <arg choice='plain'>--version</arg>
+                        </group>
+                </arg>
                 <arg choice='plain'>
                         <group choice='req'>
                                <arg choice='plain'>-h</arg>
@@ -150,6 +162,7 @@
      with new versions of packages; <command>apt-get</command> has a "smart" conflict 
      resolution system, and it will attempt to upgrade the most important 
      packages at the expense of less important ones if necessary. 
+        So, <literal>dist-upgrade</literal> command may remove some packages.
      The <filename>/etc/apt/sources.list</filename> file contains a list of locations 
      from which to retrieve desired package files.
      See also &apt-preferences; for a mechanism for
@@ -158,24 +171,23 @@
 
      <varlistentry><term>install</term>
      <listitem>
-            <para>
-                    <literal>install</literal> is followed by one or more 
-                    packages desired for installation or upgrading. 
-                    Each package is a package name, not a fully qualified 
-                    filename (for instance, in a Debian GNU/Linux system, 
-                    libc6 would be the argument provided, not 
-                    <literal>libc6_1.9.6-2.deb</literal>). All packages required 
-                    by the package(s) specified for installation will also 
-                    be retrieved and installed. 
-                    The <filename>/etc/apt/sources.list</filename> file is 
-                    used to locate the desired packages. If a hyphen is 
-                    appended to the package name (with no intervening space), 
-                    the identified package will be removed if it is installed. 
-                    Similarly a plus sign can be used to designate a 
-                    package to install. These latter features may be used 
-                    to override decisions made by apt-get's conflict 
-                    resolution system.
-            </para>
+        <para><literal>install</literal> is followed by one or more 
+        packages desired for installation or upgrading. 
+        Each package is a package name, not a fully qualified 
+        filename (for instance, in a Debian GNU/Linux system, 
+        libc6 would be the argument provided, not 
+        <literal>libc6_1.9.6-2.deb</literal>). All packages required 
+        by the package(s) specified for installation will also 
+        be retrieved and installed. 
+        The <filename>/etc/apt/sources.list</filename> file is 
+        used to locate the desired packages. If a hyphen is 
+        appended to the package name (with no intervening space), 
+        the identified package will be removed if it is installed. 
+        Similarly a plus sign can be used to designate a 
+        package to install. These latter features may be used 
+        to override decisions made by apt-get's conflict 
+        resolution system.
+        </para>
 
      <para>A specific version of a package can be selected for installation by 
      following the package name with an equals and the version of the package 
@@ -449,7 +461,8 @@
      of this option. In short, this option
      lets you have simple control over which distribution packages will be
      retrieved from. Some common examples might be 
-     <option>-t '2.1*'</option> or <option>-t unstable</option>.
+     <option>-t '2.1*'</option>, <option>-t unstable</option>
+     or <option>-t sid</option>.
      Configuration Item: <literal>APT::Default-Release</literal>;
      see also the &apt-preferences; manual page.</para></listitem>
      </varlistentry>
@@ -575,8 +588,8 @@
         <title>CURRENT AUTHORS</title>
         <para>
                 &apt-author.team;
-                &apt-qapage;
         </para>
+                &apt-qapage;
  </refsect1>
  &manbugs;
 </refentry>