Improve help texts

diff --git a/ChangeLog b/ChangeLog
index 0b98ef1c0209ada7f11f8603b345b1860d3f48cd..65cae6c60f4e6afae343dc70241e443473985dda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Tue Jul 31 12:26:41 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * po/de.po: Updated
+  * main/query.c: Fix help texts a bit to reflect that dpkg-query is
+    not dpkg
 
 Fri Jul 27 04:21:51 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/main/query.c b/main/query.c
index 082e5aecd3553c75609eedde2f5d573f4ed955f9..58f5f821bc1b9d1d349caf179476aada04efbbcd 100644 (file)
--- a/main/query.c
+++ b/main/query.c
@@ -442,15 +442,16 @@ static void printversion(void) {
   */
 static void usage(void) {
   if (fprintf (stdout, _("\
-Usage: \n\
-  dpkg -s|--status <package-name> ...      display package status details\n\
-  dpkg -p|--print-avail <package-name> ... display available version details\n\
-  dpkg -L|--listfiles <package-name> ...   list files `owned' by package(s)\n\
-  dpkg -l|--list [<pattern> ...]           list packages concisely\n\
-  dpkg -W|--show <pattern> ...             show information on package(s)\n\
-  dpkg -S|--search <pattern> ...           find package(s) owning file(s)\n\
-  dpkg --help | --version                  show this help / version number\n\
-  dpkg --licence                           print copyright licensing terms\n\
+Usage: dpkg-query [<option>] <command>\n\
+Commands:\n\
+  -s|--status <package-name> ...      display package status details\n\
+  -p|--print-avail <package-name> ... display available version details\n\
+  -L|--listfiles <package-name> ...   list files `owned' by package(s)\n\
+  -l|--list [<pattern> ...]           list packages concisely\n\
+  -W|--show <pattern> ...             show information on package(s)\n\
+  -S|--search <pattern> ...           find package(s) owning file(s)\n\
+  --help | --version                  show this help / version number\n\
+  --licence                           print copyright licensing terms\n\
 \n\
 Options:\n\
   --admindir=<directory>     Use <directory> instead of %s\n\
@@ -458,11 +459,10 @@ Options:\n\
            ADMINDIR) < 0) werr ("stdout");
 }
 
-const char thisname[]= "dpkg";
+const char thisname[]= "dpkg-query";
 const char printforhelp[]= N_("\
-Type dpkg-query --help for help about installing and deinstalling packages [*];\n\
-Use dselect for user-friendly package management;\n\
-Type dpkg-query --licence for copyright licence and lack of warranty (GNU GPL) [*].\n\
+Use --help for help about querying packages;\n\
+Use --licence for copyright licence and lack of warranty (GNU GPL).\n\
 \n");
 
 const struct cmdinfo *cipaction= 0;