From: Michael Vogt <mvo@debian.org>
Date: Mon, 6 Jan 2014 06:59:37 +0000 (+0100)
Subject: improve apt.8.xml
X-Git-Tag: 1.0~9^2~5
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/259d88d94843fbce7c8100f8b337b7b8fb58b840?ds=inline;hp=-c

improve apt.8.xml
---

259d88d94843fbce7c8100f8b337b7b8fb58b840
diff --combined cmdline/apt.cc
index 5771e664f,d2eb7a5a3..170478174
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@@ -41,7 -41,6 +41,7 @@@
  #include <apt-pkg/pkgsystem.h>
  #include <apt-pkg/indexfile.h>
  #include <apt-pkg/metaindex.h>
 +#include <apt-pkg/hashes.h>
  
  #include <apti18n.h>
  
@@@ -55,12 -54,8 +55,12 @@@
  #include <apt-private/private-upgrade.h>
  #include <apt-private/private-show.h>
  #include <apt-private/private-main.h>
 +#include <apt-private/private-utils.h>
 +#include <apt-private/private-sources.h>
  									/*}}}*/
  
 +
 +
  bool ShowHelp(CommandLine &CmdL)
  {
     ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
@@@ -76,11 -71,11 +76,13 @@@
        " search - search in package descriptions\n"
        " show - show package details\n"
        "\n"
--      " update - update list of available packages\n"
 -      " upgrade - upgrade the systems packages\n"
 -      "\n"
        " install - install packages\n"
-       " upgrade - upgrade the systems packages\n"
+       " remove - remove packages\n"
 +      "\n"
 +      " edit-sources - edit the source information file\n"
++      "\n"
++      " update - update list of available packages\n"
++      " upgrade - upgrade the systems packages\n"
         );
     
     return true;
@@@ -96,8 -91,6 +98,8 @@@ int main(int argc, const char *argv[]
                                     {"remove", &DoInstall},
                                     {"update",&DoUpdate},
                                     {"upgrade",&DoUpgradeWithAllowNewPackages},
 +                                   // misc
 +                                   {"edit-sources",&EditSources},
                                     // helper
                                     {"moo",&DoMoo},
                                     {"help",&ShowHelp},
diff --combined doc/apt.8.xml
index 0340e043f,a0ae9086d..bb1f6bb91
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@@ -13,7 -13,6 +13,6 @@@
  <refentry>
  
   <refentryinfo>
-    &apt-author.jgunthorpe;
     &apt-author.team;
     &apt-email;
     &apt-product;
@@@ -42,18 -41,35 +41,26 @@@
     </para>
  
     <variablelist>
-      <varlistentry><term><option>update</option></term>
-      <listitem><para><literal>update</literal> is used to
-      resynchronize the package index files from their sources.
+      <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
+      package names and the following options:
+        <option>--installed</option>
+        <option>--upgradable</option>
+        <option>--all-versions</option>
+      are supported.
       </para></listitem>
-    </varlistentry>
+      </varlistentry>
       
-      <varlistentry><term><option>upgrade</option></term>
-      <listitem><para><literal>upgrade</literal> is used to install the
-      newest versions of all packages currently installed on the system
-      from the sources enumerated in
-      <filename>/etc/apt/sources.list</filename>. New package will be
-      installed, but existing package will never removed.
+      <varlistentry><term><option>search</option></term>
+      <listitem><para><literal>search</literal> searches for the given
+      term(s) and display matching packages.
+      </para></listitem>
+      </varlistentry>
+ 
 -     <varlistentry><term><option>update</option></term>
 -     <listitem><para><literal>update</literal> is used to
 -     resynchronize the package index files from their sources.
 -     </para></listitem>
 -     </varlistentry>
 -     
 -     <varlistentry><term><option>upgrade</option></term>
 -     <listitem><para><literal>upgrade</literal> is used to install the
 -     newest versions of all packages currently installed on the system
 -     from the sources enumerated in
 -     <filename>/etc/apt/sources.list</filename>. New package will be
 -     installed, but existing package will never removed.
++     <varlistentry><term><option>show</option></term>
++     <listitem><para><literal>show</literal> shows the package information
++     for the given package(s).
       </para></listitem>
       </varlistentry>
  
@@@ -80,6 -96,6 +87,28 @@@
       installed instead of removed.</para></listitem>
       </varlistentry>
  
++     <varlistentry><term><option>edit-sources</option></term>
++     <listitem><para><literal>edit-sources</literal> lets you edit
++     your sources.list file and provides basic sanity checks.
++     </para></listitem>
++     </varlistentry>
++
++     <varlistentry><term><option>update</option></term>
++     <listitem><para><literal>update</literal> is used to
++     resynchronize the package index files from their sources.
++     </para></listitem>
++     </varlistentry>
++     
++     <varlistentry><term><option>upgrade</option></term>
++     <listitem><para><literal>upgrade</literal> is used to install the
++     newest versions of all packages currently installed on the system
++     from the sources enumerated in
++     <filename>/etc/apt/sources.list</filename>. New package will be
++     installed, but existing package will never removed.
++     </para></listitem>
++     </varlistentry>
++
++
     </variablelist>
   </refsect1>