Standarize start-stop-daemon usage output format.

ChangeLog

@@ -1,3 +1,7 @@
+2006-05-02  Guillem Jover  <guillem@debian.org>
+
+	* utils/start-stop-daemon.c (do_help): Standarize output format.
+
 2006-05-02  Guillem Jover  <guillem@debian.org>
 
 	* dselect/main.cc (usage): Split string and align so duped strings get

debian/changelog

@@ -40,6 +40,7 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
     ones from the package being built.
   * Split usage strings to make it easier for translators when those change.
     Closes: #323957
+  * Standarize start-stop-daemon usage output format.
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 29 Apr 2006 14:28:55 +0200
 

utils/start-stop-daemon.c

@@ -285,24 +285,27 @@ do_help(void)
 "start-stop-daemon %s for Debian - small and fast C version written by\n"
 "Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
 "\n"
-"Usage:\n"
-"  start-stop-daemon -S|--start options ... -- arguments ...\n"
-"  start-stop-daemon -K|--stop options ...\n"
-"  start-stop-daemon -H|--help\n"
-"  start-stop-daemon -V|--version\n"
+"Usage: start-stop-daemon [<option> ...] <command>\n"
+"\n"
+"Commands:\n"
+"  -S|--start -- <argument> ...  start a program and pass <arguments> to it\n"
+"  -K|--stop                     stop a program\n"
+"  -H|--help                     print help information\n"
+"  -V|--version                  print version\n"
 "\n"
 "Options (at least one of --exec|--pidfile|--user is required):\n"
 "  -x|--exec <executable>        program to start/check if it is running\n"
 "  -p|--pidfile <pid-file>       pid file to check\n"
 "  -c|--chuid <name|uid[:group|gid]>\n"
-"  		change to this user/group before starting process\n"
+"                                change to this user/group before starting\n"
+"                                  process\n"
 "  -u|--user <username>|<uid>    stop processes owned by this user\n"
 "  -g|--group <group|gid>        run process as this group\n"
 "  -n|--name <process-name>      stop processes with this name\n"
 "  -s|--signal <signal>          signal to send (default TERM)\n"
 "  -a|--startas <pathname>       program to start (default is <executable>)\n"
 "  -r|--chroot <directory>       chroot to <directory> before starting\n"
-"  -d|--chdir <directory>        Change to <directory>(default is /)\n"
+"  -d|--chdir <directory>        change to <directory> (default is /)\n"
 "  -N|--nicelevel <incr>         add incr to the process's nice level\n"
 "  -b|--background               force the process to detach\n"
 "  -m|--make-pidfile             create the pidfile before starting\n"
@@ -311,6 +314,7 @@ do_help(void)
 "  -o|--oknodo                   exit status 0 (not 1) if nothing done\n"
 "  -q|--quiet                    be more quiet\n"
 "  -v|--verbose                  be more verbose\n"
+"\n"
 "Retry <schedule> is <item>|/<item>/... where <item> is one of\n"
 " -<signal-num>|[-]<signal-name>  send that signal\n"
 " <timeout>                       wait that many seconds\n"