From: Rainer Jung <rjung@apache.org>
Date: Wed, 6 May 2009 16:53:55 +0000 (+0000)
Subject: Fix usage message on the Windows platform.
X-Git-Tag: 2.3.3~640
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87996b526a9647434894d7b89980c2c3511e53e7;p=thirdparty%2Fapache%2Fhttpd.git

Fix usage message on the Windows platform.
- do not include graceful commands and duplicate
  start|restart|stop
- add ServerRoot to the parameters encapsulated by "-n"


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

diff --git a/CHANGES b/CHANGES
index f9e0fa4aa81..c889624c188 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.3.3
      mod_proxy_ajp: Avoid delivering content from a previous request which
      failed to send a request body. PR 46949 [Ruediger Pluem]
 
+  *) Windows: Fix usage message.
+     [Rainer Jung]
+
   *) apachectl: When passing through arguments to httpd in
      non-SysV mode, use the "$@" syntax to preserve arguments.
      [Eric Covener]
diff --git a/server/main.c b/server/main.c
index d44ee4e796b..a3cfe7ed5ba 100644
--- a/server/main.c
+++ b/server/main.c
@@ -361,17 +361,18 @@ static void usage(process_rec *process)
 
 #ifdef WIN32
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                 "       %s [-w] [-k start|restart|stop|shutdown]", pad);
+                 "       %s [-w] [-k start|restart|stop|shutdown] [-n service_name]", pad);
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "       %s [-k install|config|uninstall] [-n service_name]",
                  pad);
-#endif
+#else
 /* XXX not all MPMs support signalling the server in general or graceful-stop
  * in particular
  */
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "       %s [-k start|restart|graceful|graceful-stop|stop]",
                  pad);
+#endif
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
@@ -405,7 +406,7 @@ static void usage(process_rec *process)
 #ifdef WIN32
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -n name            : set service name and use its "
-                 "ServerConfigFile");
+                 "ServerConfigFile and ServerRoot");
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -k start           : tell Apache to start");
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,