X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a530607f8ac4936402831d854f171fc8dc89ef4f..d1b14e80cc22908d65445c9eb3926ebb4be190e7:/doc/apt-get.8.xml

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index c63011b2a..ace7f9e1b 100644
--- 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>30 October 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>
@@ -60,6 +60,7 @@
          <arg choice='plain'>update</arg>
          <arg choice='plain'>upgrade</arg>
          <arg choice='plain'>dselect-upgrade</arg>
+         <arg choice='plain'>dist-upgrade</arg>
          <arg choice='plain'>install 
 			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
 				<arg>
@@ -88,6 +89,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>
@@ -101,8 +108,8 @@
  <refsect1><title>Description</title>
    <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(8),
-   aptitude, synaptic, gnome-apt and wajig.</para>
+   library.  Several "front-end" interfaces exist, such as &dselect;,
+   &aptitude;, &synaptic;, &gnome-apt; 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>
@@ -149,6 +156,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
@@ -157,24 +165,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 
@@ -212,14 +219,15 @@
 
      <varlistentry><term>remove</term>
      <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
-     removed instead of installed. If a plus sign is appended to the package 
+	 removed instead of installed. Note the removing a package leaves its
+	 configuration files in system. If a plus sign is appended to the package 
      name (with no intervening space), the identified package will be 
      installed instead of removed.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>purge</term>
      <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are 
-     removed and purged.</para></listitem>
+     removed and purged (any configuration files are deleted too).</para></listitem>
      </varlistentry>
 
      <varlistentry><term>source</term>
@@ -418,7 +426,8 @@
      <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.
+	 scheduled to be purged. <option>remove --purge</option> is equivalent for
+	 <option>purge</option> command.
      Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
      </varlistentry>