Integrate rbb's forward port of -k config into the -h(elp), and

  reorder some directives in the -h(elp) so they 'flow'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94160 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/main.c b/server/main.c
index ffdaa9c4a0289428d5c01d45ae2bdce92118b109..6e313394bc29dbdcc8efdfffae3634eef5c5e1c7 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -300,11 +300,10 @@ static void usage(process_rec *process)
 
 #ifdef WIN32
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "       %s [-k restart|shutdown|start]", pad);
+                 "       %s [-k start|restart|stop|shutdown]", pad);
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "       %s [-n service_name]", pad);
-    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "       %s [-i] [-u]", pad);
+                 "       %s [-k install|config|uninstall] [-n service_name]",
+                 pad);
 #endif
 
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
@@ -338,16 +337,19 @@ static void usage(process_rec *process)
                  "  -n name           : set service name and use its "
                  "ServerConfigFile");
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "  -k shutdown       : tell running Apache to shutdown");
+                 "  -k start          : tell Apache to start");
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                  "  -k restart        : tell running Apache to do a graceful "
                  "restart");
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "  -k start          : tell Apache to start");
+                 "  -k stop|shutdown  : tell running Apache to shutdown");
+    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
+                 "  -k install        : install an Apache service");
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "  -i                : install an Apache service");
+                 "  -k config         : change startup Options of an Apache "
+                 "service");
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
-                 "  -u                : uninstall an Apache service");
+                 "  -k uninstall      : uninstall an Apache service");
 #endif
 
     ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,