Author: guillem
Date: 2006-05-02 09:31:49 +0000 (Tue, 02 May 2006)
New Revision: 263
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/utils/start-stop-daemon.c
Log:
Standarize start-stop-daemon usage output format.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-02 09:27:37 UTC (rev 262)
+++ trunk/ChangeLog 2006-05-02 09:31:49 UTC (rev 263)
@@ -1,5 +1,9 @@
2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+ * utils/start-stop-daemon.c (do_help): Standarize output format.
+
+2006-05-02 Guillem Jover <[EMAIL PROTECTED]>
+
* dselect/main.cc (usage): Split string and align so duped strings get
merged.
* dpkg-deb/main.c (usage): Likewise.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-02 09:27:37 UTC (rev 262)
+++ trunk/debian/changelog 2006-05-02 09:31:49 UTC (rev 263)
@@ -40,6 +40,7 @@
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 <[EMAIL PROTECTED]> Sat, 29 Apr 2006 14:28:55 +0200
Modified: trunk/utils/start-stop-daemon.c
===================================================================
--- trunk/utils/start-stop-daemon.c 2006-05-02 09:27:37 UTC (rev 262)
+++ trunk/utils/start-stop-daemon.c 2006-05-02 09:31:49 UTC (rev 263)
@@ -285,24 +285,27 @@
"start-stop-daemon %s for Debian - small and fast C version written by\n"
"Marek Michalkiewicz <[EMAIL PROTECTED]>, 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 @@
" -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"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
