small typos fixed in help

diff --git a/ChangeLog b/ChangeLog
index 7c1a0913a0a15703ca7db285e997a5f75ca799d7..5cc9bd32cb133f984e26307d7711fd9a001e4fd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Changes in 21.7
 ===============
        * Upgraded SELinux code to new api, thanks to Chris PeBenito
        * define rpmatch for libraries that dont have it
+       * Fixed small typos in help thanks to Benno Schulenberg
+         fixes SF# 1150042
 
 Changes in 21.6
 ===============

diff --git a/src/fuser.c b/src/fuser.c
index 6267f4d0199d29383417f488b2a23aff7b9b260b..748e58d3bae5f12bbb181a5d5624e15604078164 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -958,21 +958,22 @@ static void
 usage (void)
 {
   fprintf (stderr, _(
-    "usage: fuser [ -a | -s | -c ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
-    "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
+    "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
+    "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
     "       fuser -l\n"
-    "       fuser -V\n\n"
+    "       fuser -V\n"
+    "Show which processes use the named files, sockets, or filesystems.\n\n "
     "    -a        display unused files too\n"
     "    -c        mounted FS\n"
     "    -f        silently ignored (for POSIX compatibility)\n"
-    "    -k        kill processes accessing that file\n"
     "    -i        ask before killing (ignored without -k)\n"
-    "    -l        list signal names\n"
-    "    -m        mounted FS\n"
-    "    -n space  search in the specified name space (file, udp, or tcp)\n"
+    "    -k        kill processes accessing the named file\n"
+    "    -l        list available signal names\n"
+    "    -m        show all processes using the named filesystems\n"
+    "    -n SPACE  search in this name space (file, udp, or tcp)\n"
     "    -s        silent operation\n"
-    "    -signal   send signal instead of SIGKILL\n"
-    "    -u        display user ids\n"
+    "    -SIGNAL   send this signal instead of SIGKILL\n"
+    "    -u        display user IDs\n"
     "    -v        verbose output\n"
     "    -V        display version information\n"
     "    -4        search IPv4 sockets only\n"
@@ -984,7 +985,7 @@ usage (void)
 
 void print_version()
 {
-  fprintf(stderr, _("fuser (psmisc) %s\n"), VERSION);
+  fprintf(stderr, _("fuser (PSmisc) %s\n"), VERSION);
   fprintf(stderr, _(
     "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n"));
   fprintf(stderr, _(

diff --git a/src/killall.c b/src/killall.c
index 56f5a4ff5839f6a438c23e180803221b24f0fa30..490222cac4063522f75be446bc976638cac32c8e 100644 (file)
--- a/src/killall.c
+++ b/src/killall.c
@@ -379,7 +379,7 @@ static void
 usage_pidof (void)
 {
   fprintf (stderr, _(
-    "usage: pidof [ -eg ] name ...\n"
+    "Usage: pidof [ -eg ] NAME...\n"
     "       pidof -V\n\n"
     "    -e      require exact match for very long names;\n"
     "            skip if the command line is unavailable\n"
@@ -391,24 +391,29 @@ usage_pidof (void)
 static void
 usage_killall (void)
 {
+#ifdef FLASK_LINUX
   fprintf(stderr, _(
-    "usage: killall [ OPTIONS ] [ -- ] name ...\n"));
+    "Usage: killall [-Z CONTEXT] [ -egiqvw ] [ -SIGNAL ] NAME...\n"));
+#else  /*FLASK_LINUX*/
+  fprintf(stderr, _(
+    "Usage: killall [OPTIONS]... [--] NAME...\n"));
+#endif /*FLASK_LINUX*/
   fprintf(stderr, _(
     "       killall -l, --list\n"
-    "       killall -V --version\n\n"
+    "       killall -V, --version\n\n"
     "  -e,--exact          require exact match for very long names\n"
     "  -I,--ignore-case    case insensitive process name match\n"
     "  -g,--process-group  kill process group instead of process\n"
     "  -i,--interactive    ask for confirmation before killing\n"
     "  -l,--list           list all known signal names\n"
     "  -q,--quiet          don't print complaints\n"
-    "  -s,--signal         send signal instead of SIGTERM\n"
+    "  -s,--signal SIGNAL  send this signal instead of SIGTERM\n"
     "  -v,--verbose        report if the signal was successfully sent\n"
     "  -V,--version        display version information\n"
     "  -w,--wait           wait for processes to die\n\n"));
 #ifdef WITH_SELINUX
   fprintf(stderr, _(
-    "  -Z,--context        kill only process(es) having context\n"
+    "  -Z,--context CONTEXT kill only process(es) having context\n"
     "                      (must precede other arguments)"));
 #endif /*WITH_SELINUX*/
 }
@@ -426,7 +431,7 @@ usage (void)
 
 void print_version()
 {
-  fprintf(stderr, "%s (psmisc) %s\n", pidof ? "pidof" : "killall", VERSION);
+  fprintf(stderr, "%s (PSmisc) %s\n", pidof ? "pidof" : "killall", VERSION);
   fprintf(stderr, _(
     "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n"));
   fprintf(stderr, _(

diff --git a/src/pstree.c b/src/pstree.c
index 7d01f9918b73b8a3876ff6853413f98a3a4a4722..2b568c4aa8fc53d118067165f0717982e97e4b44 100644 (file)
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -684,14 +684,15 @@ static void
 usage (void)
 {
   fprintf (stderr, _(
-    "usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
-    "              [ -A | -G | -U ] [ pid | user]\n"
-    "       pstree -V\n\n"
+    "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
+    "              [ -A | -G | -U ] [ PID | USER ]\n"
+    "       pstree -V\n"
+    "Display a tree of processes.\n\n"
     "    -a     show command line arguments\n"
     "    -A     use ASCII line drawing characters\n"
     "    -c     don't compact identical subtrees\n"
     "    -h     highlight current process and its ancestors\n"
-    "    -H pid highlight process \"pid\" and its ancestors\n"
+    "    -H PID highlight this process and its ancestors\n"
     "    -G     use VT100 line drawing characters\n"
     "    -l     don't truncate long lines\n"
     "    -n     sort output by PID\n"
@@ -704,14 +705,14 @@ usage (void)
   fprintf (stderr, _(
     "    -U     use UTF-8 (Unicode) line drawing characters\n"
     "    -V     display version information\n"
-    "    pid    start at pid, default 1 (init)\n"
-    "    user   show only trees rooted at processes of that user\n\n"));
+    "    PID    start at this PID; default is 1 (init)\n"
+    "    USER   show only trees rooted at processes of this user\n\n"));
   exit (1);
 }
 
 void print_version()
 {
-  fprintf(stderr, _("pstree (psmisc) %s\n"), VERSION);
+  fprintf(stderr, _("pstree (PSmisc) %s\n"), VERSION);
   fprintf(stderr, _(
     "Copyright (C) 1993-2002 Werner Almesberger and Craig Small\n\n"));
   fprintf(stderr, _(