* mkpasswd.c (usage) Remove extra newline from description output.

3 files changed, 26 insertions, 6 deletions

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 3c9b1bfa2..c1be6532d 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,5 +1,9 @@
 2003-04-26  Joshua Daniel Franklin <joshuadfranklin at yahoo dot com>
 
+	* mkpasswd.c (usage) Remove extra newline from description output.
+
+2003-04-26  Joshua Daniel Franklin <joshuadfranklin at yahoo dot com>
+
 	* cygcheck.cc (usage) Add description output.
 	* cygpath.cc (usage) Add description output.
 	* dumper.cc (usage) Add newline to description output.
diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c
index 111d24b51..4a547a535 100644
--- a/winsup/utils/mkpasswd.c
+++ b/winsup/utils/mkpasswd.c
@@ -484,7 +484,7 @@ print_special (int print_sids,
 int
 usage (FILE * stream, int isNT)
 {
-  fprintf (stream, "Usage: mkpasswd [OPTION]... [domain]...\n\n"
+  fprintf (stream, "Usage: mkpasswd [OPTION]... [domain]...\n"
 	           "Print /etc/passwd file to stdout\n\n"
 	           "Options:\n");
   if (isNT)
diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml
index a5cecec1d..8f7c40bc1 100644
--- a/winsup/utils/utils.sgml
+++ b/winsup/utils/utils.sgml
@@ -14,6 +14,8 @@ command-line utilities support the <literal>--help</literal> and
 
 <screen>
 Usage: cygcheck [OPTIONS] [program ...]
+Check system information or PROGRAM library dependencies
+
  -c, --check-setup  check packages installed via setup.exe
  -s, --sysinfo      system information (not with -k)
  -v, --verbose      verbose output (indented) (for -s or programs)
@@ -77,6 +79,8 @@ for example:</para>
 <screen>
 Usage: cygpath (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME
        cygpath [-ADHPSW] 
+Convert Unix and Windows format paths, or output system path information
+
 Output type options:
   -d, --dos             print DOS (short) form of NAME (C:\PROGRA~1\)
   -m, --mixed           like --windows, but with regular slashes (C:/WINNT)
@@ -177,6 +181,7 @@ other formats.</para>
 <screen>
 Usage: dumper [OPTION] FILENAME WIN32PID
 Dump core from WIN32PID to FILENAME.core
+
 -d, --verbose  be verbose while dumping
 -h, --help     output help information and exit
 -q, --quiet    be quiet while dumping (default)
@@ -271,6 +276,8 @@ The format for ACL output is as follows:
 <screen>
 Usage: kill [-f] [-signal] [-s signal] pid1 [pid2 ...]
        kill -l [signal]
+Send signals to processes
+
  -f, --force     force, using win32 interface if necessary
  -l, --list      print a list of signal names
  -s, --signal    send signal (use kill --list for a list)
@@ -367,8 +374,7 @@ SIGUSR2     31    user defined signal 2
 
 <screen>
 Usage: mkgroup [OPTION]... [domain]...
-
-This program prints a /etc/group file to stdout
+Prints /etc/group file to stdout
 
 Options:
    -l,--local             print local group information
@@ -435,8 +441,7 @@ while the local machine is disconnected from the Domain Controller.
 
 <screen>
 Usage: mkpasswd [OPTION]... [domain]...
-
-This program prints a /etc/passwd file to stdout
+Prints /etc/passwd file to stdout
 
 Options:
    -l,--local              print local user accounts
@@ -519,6 +524,8 @@ greatly reducing the amount of time it takes in a large domain.</para>
 
 <screen>
 Usage: mount [OPTION] [&lt;win32path&gt; &lt;posixpath&gt;]
+Display information about mounted filesystems, or mount a filesystem
+
   -b, --binary     (default)    text files are equivalent to binary files
                                 (newline = \n)
   -c, --change-cygdrive-prefix  change the cygdrive path prefix to &lt;posixpath&gt;
@@ -713,6 +720,7 @@ find <filename>mtpt</filename>.
 <screen>
 Usage: passwd (-l|-u|-S) [USER]
        passwd [-i NUM] [-n MINDAYS] [-x MAXDAYS] [-L LEN]
+Change USER's password or password attributes
 
 User operations:
  -l, --lock      lock USER's account
@@ -790,6 +798,8 @@ some systems.</para>
 
 <screen>
 Usage: ps [-aefls] [-u UID]
+Report process status
+
  -a, --all       show processes of all users
  -e, --everyone  show processes of all users
  -f, --full      show process uids, ppids
@@ -842,6 +852,7 @@ option.
 
 <screen>
 Usage: regtool.exe [OPTION] (add | check | get | list | remove | unset) KEY
+View or edit the Win32 registry
 
 Actions:
  add KEY\SUBKEY             add new SUBKEY
@@ -952,7 +963,6 @@ an alternate key/value separator character.
 <screen>
 Usage: setfacl [-r] (-f ACL_FILE | -s acl_entries) FILE...
        setfacl [-r] ([-d acl_entries] [-m acl_entries]) FILE...
-
 Modify file and directory access control lists (ACLs)
 
   -d, --delete     delete one or more specified ACL entries
@@ -1102,6 +1112,8 @@ account currently.
 
 <screen>
 Usage: ssp [options] low_pc high_pc command...
+Single-step profile COMMAND
+
  -c, --console-trace  trace every EIP value to the console. *Lots* slower.
  -d, --disable        disable single-stepping by default; use
                       OutputDebugString ("ssp on") to enable stepping
@@ -1297,6 +1309,8 @@ $ ssp <literal>-v</literal> <literal>-s</literal> <literal>-l</literal> <literal
 <screen>
 Usage: strace.exe [OPTIONS] &lt;command-line&gt;
 Usage: strace.exe [OPTIONS] -p &lt;pid&gt;
+Trace system calls and signals
+
   -b, --buffer-size=SIZE       set size of output file buffer
   -d, --no-delta               don't display the delta-t microsecond timestamp
   -f, --trace-children         trace child processes (toggle - default true)
@@ -1367,6 +1381,8 @@ Cygwin DLL itself.</para>
 
 <screen>
 Usage: umount.exe [OPTION] [&lt;posixpath&gt;]
+Unmount filesystems
+
   -A, --remove-all-mounts       remove all mounts
   -c, --remove-cygdrive-prefix  remove cygdrive prefix
   -h, --help                    output usage information and exit