From: Eric Covener
Date: Sat, 2 Feb 2013 16:24:49 +0000 (+0000)
Subject: Merge r1031312 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
X-Git-Tag: 2.2.24~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a07cfdce29f2d45a2d99e82b96e9cba2d3dd04;p=thirdparty%2Fapache%2Fhttpd.git
Merge r1031312 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
Correct the instructions for stopping an Apache server
running in a Windows console. Reported by jhannwong.
PR47325
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1441768 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index 6efbbb1e5b8..303dcdb98d0 100644
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -545,15 +545,19 @@
shortcut starts the service. If the Apache service is running
already, the shortcut doesn't do anything.
- You can tell a running Apache to stop by opening another console
+
If Apache is running as a service, you can tell it to stop by opening another console
window and entering:
httpd.exe -k shutdown
- This should be preferred over pressing Control-C because this
- lets Apache end any current operations and clean up gracefully.
+ Running as a service should be preferred over running in a
+ console window because this lets Apache end any current operations
+ and clean up gracefully.
+
+ But if the server is running in a console window, you can
+ only stop it by pressing Control-C in the same window.
You can also tell Apache to restart. This forces it to reread
the configuration file. Any operations in progress are allowed to
@@ -565,7 +569,7 @@
httpd.exe -k restart
-
in any other console window.
+ if the server is running as a service.
Note for people familiar with the Unix version of Apache:
these commands provide a Windows equivalent to kill -TERM