Transformation.

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

diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index e1092269186ef9994d67c351728d0d35f962558f..2208134e2408824006bcb110ad49f9a201efc5b8 100644 (file)
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -174,8 +174,9 @@ respect to case</td></tr>
       <li><code>Request_URI</code> - the resource requested on the HTTP
        request line -- generally the portion of the URL
       following the scheme and host portion without the query string. See
-      <code class="module"><a href="../mod/mod_rewrite.html#rewritecond">mod_rewrite</a></code>
-      for extra information on how to match your query string.</li>
+      the <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
+      directive of <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> for extra information on
+      how to match your query string.</li>
     </ul>
 </li>
 

diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index baf3a2848bc9b6ea6c6d1d9e25dfa4163eb48307..8de9450c44e399ba4f0077659a14cab1eb3c0acb 100644 (file)
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -149,8 +149,9 @@
       site(s).</p></li>
 
       <li><p><strong>Where to install.</strong> The default path is
-      <code>C:\Program Files\Apache Group</code> under which a directory
-      called <code>Apache2</code> will be created by default.</p></li>
+      <code>C:\Program Files\Apache Software Foundation</code>
+      under which a directory called 
+      <code>Apache2.3</code> will be created by default.</p></li>
     </ol>
 
     <p>During the installation, Apache will configure the files in the
@@ -249,7 +250,7 @@
       <li><p>Apache for Windows contains the ability to load modules at
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
-      <code>\Apache2\modules</code> directory. To activate these or
+      <code>\Apache2.3\modules</code> directory. To activate these or
       other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
       directive must be used. For example, to activate the status
       module, use the following (in addition to the status-activating
@@ -319,7 +320,7 @@
     the command prompt at the Apache <code>bin</code> subdirectory:</p>
 
     <div class="example"><p><code>
-      httpd -k install
+      httpd.exe -k install
     </code></p></div>
 
     <p>If you need to specify the name of the service you want to
@@ -328,14 +329,14 @@
     computer.</p>
 
     <div class="example"><p><code>
-      httpd -k install -n "MyServiceName"
+      httpd.exe -k install -n "MyServiceName"
     </code></p></div>
 
     <p>If you need to have specifically named configuration files for
     different services, you must use this:</p>
 
     <div class="example"><p><code>
-      httpd -k install -n "MyServiceName" -f "c:\files\my.conf"
+      httpd.exe -k install -n "MyServiceName" -f "c:\files\my.conf"
     </code></p></div>
 
     <p>If you use the first command without any special parameters except
@@ -346,13 +347,13 @@
     <p>Removing an Apache service is easy. Just use:</p>
 
     <div class="example"><p><code>
-      httpd -k uninstall
+      httpd.exe -k uninstall
     </code></p></div>
 
     <p>The specific Apache service to be uninstalled can be specified by using:</p>
 
     <div class="example"><p><code>
-      httpd -k uninstall -n "MyServiceName"
+      httpd.exe -k uninstall -n "MyServiceName"
     </code></p></div>
 
     <p>Normal starting, restarting and shutting down of an Apache
@@ -363,34 +364,34 @@
     service's configuration file by using:</p>
 
     <div class="example"><p><code>
-      httpd -n "MyServiceName" -t
+      httpd.exe -n "MyServiceName" -t
     </code></p></div>
 
     <p>You can control an Apache service by its command line switches,
     too. To start an installed Apache service you'll use this:</p>
 
     <div class="example"><p><code>
-      httpd -k start
+      httpd.exe -k start
     </code></p></div>
 
     <p>To stop an Apache service via the command line switches, use
     this:</p>
 
     <div class="example"><p><code>
-      httpd -k stop
+      httpd.exe -k stop
     </code></p></div>
 
     <p>or</p>
 
     <div class="example"><p><code>
-      httpd -k shutdown
+      httpd.exe -k shutdown
     </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 -k restart
+      httpd.exe -k restart
     </code></p></div>
 
     <p>By default, all Apache services are registered to run as the
@@ -482,7 +483,7 @@
       in the background. If you run the command</p>
 
       <div class="example"><p><code>
-        httpd -n "MyServiceName" -k start
+        httpd.exe -n "MyServiceName" -k start
       </code></p></div>
 
       <p>via a shortcut on your desktop, for example, then if the
@@ -530,7 +531,7 @@
     use the following command:</p>
 
     <div class="example"><p><code>
-      httpd
+      httpd.exe
     </code></p></div>
 
     <p>Apache will execute, and will remain running until it is stopped
@@ -551,7 +552,7 @@
     window and entering:</p>
 
     <div class="example"><p><code>
-      httpd -k shutdown
+      httpd.exe -k shutdown
     </code></p></div>
 
     <p>This should be preferred over pressing Control-C because this
@@ -562,7 +563,7 @@
     complete without interruption. To restart Apache, use:</p>
 
     <div class="example"><p><code>
-      httpd -k restart
+      httpd.exe -k restart
     </code></p></div>
 
     <div class="note">Note for people familiar with the Unix version of Apache:
@@ -574,15 +575,15 @@
     <p>If the Apache console window closes immediately or unexpectedly
     after startup, open the Command Prompt from the Start Menu --&gt;
     Programs. Change to the folder to which you installed Apache, type
-    the command <code>apache</code>, and read the error message. Then
+    the command <code>httpd.exe</code>, and read the error message. Then
     change to the logs folder, and review the <code>error.log</code>
     file for configuration mistakes. If you accepted the defaults when
     you installed Apache, the commands would be:</p>
 
     <div class="example"><p><code>
       c: <br />
-      cd "\Program Files\Apache Group\Apache2\bin" <br />
-      httpd
+      cd "\Program Files\Apache Software Foundation\Apache2.3\bin" <br />
+      httpd.exe
     </code></p></div>
 
     <p>Then wait for Apache to stop, or press Control-C. Then enter the
@@ -602,20 +603,20 @@
       a particular configuration file:</p>
 
       <div class="example"><p><code>
-        httpd -f "c:\my server files\anotherconfig.conf"
+        httpd.exe -f "c:\my server files\anotherconfig.conf"
       </code></p></div>
 
       <p>or</p>
 
       <div class="example"><p><code>
-        httpd -f files\anotherconfig.conf
+        httpd.exe -f files\anotherconfig.conf
       </code></p></div></li>
 
       <li><p><code>-n</code> specifies the installed Apache service
       whose configuration file is to be used:</p>
 
       <div class="example"><p><code>
-        httpd -n "MyServiceName"
+        httpd.exe -n "MyServiceName"
       </code></p></div>
       </li>
     </ul>
@@ -650,7 +651,7 @@
 
       <li>The server root compiled into the server. This is <code>
       /apache</code> by default, you can verify it by using <code>
-      apache -V</code> and looking for a value labelled as
+      httpd.exe -V</code> and looking for a value labelled as
       <code>HTTPD_ROOT</code>.</li>
     </ol>
 
@@ -663,7 +664,7 @@
     </p>
 
     <div class="example"><p><code>
-      HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\2.0.43
+      HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Apache\2.3.2
     </code></p></div>
 
     <p>Correspondingly, if you chose to install Apache for the current
@@ -672,7 +673,7 @@
     logged on:</p>
 
     <div class="example"><p><code>
-      HKEY_CURRENT_USER\SOFTWARE\Apache Group\Apache\2.0.43
+      HKEY_CURRENT_USER\SOFTWARE\Apache Software Foundation\Apache\2.3.2
     </code></p></div>
 
     <p>This key is compiled into the server and can enable you to test
@@ -727,9 +728,9 @@
 
     <p>If you happen to be running Apache on an alternate port, you
     need to explicitly put that in the URL:</p>
-   
+
     <div class="example"><p><code>
-       http://127.0.0.1:8080/
+      http://127.0.0.1:8080/
     </code></p></div>
 
     <p>Once your basic installation is working, you should configure it

diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index 880950c568bfb50a67d2ad176593f66bbc9ec0a1..b1571ec694ba83160472437a9f61c168c0ba34e0 100644 (file)
--- 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:619746 (outdated) -->
+<!-- English Revision: 105989:627384 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index 224fffe80d6f389a75e5b05f50dbeb916d150f65..0e3b74571bc21270f82ad7b9600578765323ea26 100644 (file)
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -170,7 +170,7 @@ relative hyperlinks?</a></li>
     is where any HTTPS compliant browser will look by default. You can force
     your browser to look on a different port by specifying it in the URL. For
     example, if your server is set up to serve pages over HTTPS on port 8080,
-    you can access them at <code>https://example.com:8080/</code></p> 
+    you can access them at <code>https://example.com:8080/</code></p>
 
 
 <h3><a name="httpstest" id="httpstest">How do I speak HTTPS manually for testing purposes?</a></h3>
@@ -186,16 +186,16 @@ relative hyperlinks?</a></li>
     
     <div class="example"><p><code>$ openssl s_client -connect localhost:443 -state -debug<br />
     GET / HTTP/1.0</code></p></div>
-    
-    <p>Before the actual HTTP response you will receive detailed 
-    information about the SSL handshake. For a more general command 
-    line client which directly understands both HTTP and HTTPS, can 
-    perform GET and POST operations, can use a proxy, supports byte 
-    ranges, etc. you should have a look at the nifty 
-    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can 
-    check that Apache is responding correctly to requests via HTTP and HTTPS as 
-    follows:</p>
-    
+
+    <p>Before the actual HTTP response you will receive detailed
+    information about the SSL handshake. For a more general command
+    line client which directly understands both HTTP and HTTPS, can
+    perform GET and POST operations, can use a proxy, supports byte
+    ranges, etc. you should have a look at the nifty
+    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can
+    check that Apache is responding correctly to requests via HTTP and
+    HTTPS as follows:</p>
+
     <div class="example"><p><code>$ curl http://localhost/<br />
     $ curl https://localhost/</code></p></div>
 
@@ -209,7 +209,7 @@ relative hyperlinks?</a></li>
     connect via HTTPS to a HTTP server (eg, using
     <code>https://example.com/</code> on a server which doesn't support HTTPS,
     or which supports it on a non-standard port). Make sure that you're
-    connecting to a (virtual) server that supports SSL. </p> 
+    connecting to a (virtual) server that supports SSL.</p>
 
 <h3><a name="refused" id="refused">Why do I get ``Connection Refused'' messages, 
     when trying to access my newly installed Apache+mod_ssl server via HTTPS?</a></h3>