From: Eric Covener <covener@apache.org>
Date: Sat, 2 Feb 2013 16:25:00 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.24~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=405dbb4643fc5686f1648cdf753a6e437af3d036;p=thirdparty%2Fapache%2Fhttpd.git

xforms



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1441769 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index a72d9e65068..3671e2e2c1d 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -271,9 +271,7 @@
       Windows filenames instead of Unix ones. However, because Apache
       may interpret backslashes as an "escape character" sequence, you
       should consistently use forward slashes in path names, not 
-      backslashes.  Drive letters can be used; if omitted, the drive
-      of the SystemRoot directive (or -d command line option) becomes
-      the default.</p></li>
+      backslashes.</p></li>
 
       <li><p>While filenames are generally case-insensitive on
       Windows, URLs are still treated internally as case-sensitive
@@ -376,7 +374,8 @@
     <p>If you need to specify the name of the service you want to
     install, use the following command. You have to do this if you
     have several different service installations of Apache on your
-    computer.</p>
+    computer. If you specify a name during the install, you have to
+    also specify it during any other -k operation.</p>
 
     <div class="example"><p><code>
       httpd.exe -k install -n "MyServiceName"
@@ -421,27 +420,27 @@
     too. To start an installed Apache service you'll use this:</p>
 
     <div class="example"><p><code>
-      httpd.exe -k start
+      httpd.exe -k start -n "MyServiceName"
     </code></p></div>
 
     <p>To stop an Apache service via the command line switches, use
     this:</p>
 
     <div class="example"><p><code>
-      httpd.exe -k stop
+      httpd.exe -k stop -n "MyServiceName"
     </code></p></div>
 
     <p>or</p>
 
     <div class="example"><p><code>
-      httpd.exe -k shutdown
+      httpd.exe -k shutdown -n "MyServiceName"
     </code></p></div>
 
     <p>You can also restart a running service and force it to reread
     its configuration file by using:</p>
 
     <div class="example"><p><code>
-      httpd.exe -k restart
+      httpd.exe -k restart -n "MyServiceName"
     </code></p></div>
 
     <p>By default, all Apache services are registered to run as the
@@ -554,15 +553,19 @@
     shortcut starts the service. If the Apache service is running
     already, the shortcut doesn't do anything.</p>
 
-    <p>You can tell a running Apache to stop by opening another console
+    <p>If Apache is running as a service, you can tell it to stop by opening another console
     window and entering:</p>
 
     <div class="example"><p><code>
       httpd.exe -k shutdown
     </code></p></div>
 
-    <p>This should be preferred over pressing Control-C because this
-    lets Apache end any current operations and clean up gracefully.</p>
+    <p>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.</p>
+
+    <p>But if the server is running in a console window, you can
+    only stop it by pressing Control-C in the same window.</p>
 
     <p>You can also tell Apache to restart. This forces it to reread
     the configuration file. Any operations in progress are allowed to
@@ -574,7 +577,7 @@
       httpd.exe -k restart
     </code></p></div>
 
-    <p>in any other console window.</p>
+    <p>if the server is running as a service.</p>
 
     <div class="note">Note for people familiar with the Unix version of Apache:
     these commands provide a Windows equivalent to <code>kill -TERM
diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 6fd9018f43d..92d3e0024a3 100644
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1200989 (outdated) -->
+<!-- English Revision: 105989:1441752 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more