From: André Malo <nd@apache.org>
Date: Thu, 6 Jul 2006 20:52:51 +0000 (+0000)
Subject: update transformation
X-Git-Tag: 2.2.3~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e6919aefb563186e88f6617dee8b3e2cae618b8;p=thirdparty%2Fapache%2Fhttpd.git

update transformation


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

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 08a0589511d..c8766c9c517 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -504,6 +504,7 @@ Negotiation</a></li>
 
     <div class="example"><h3>Example</h3><p><code>
       SetEnvIf Cookie "language=(.+)" prefer-language=$1
+      Header append Vary cookie
     </code></p></div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
diff --git a/docs/manual/content-negotiation.html.ja.euc-jp b/docs/manual/content-negotiation.html.ja.euc-jp
index 43c2be7c570..56441605a67 100644
--- a/docs/manual/content-negotiation.html.ja.euc-jp
+++ b/docs/manual/content-negotiation.html.ja.euc-jp
@@ -22,6 +22,8 @@
 <a href="./ja/content-negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
 
 
     <p>Apache ¤Ï HTTP/1.1 ¤Îµ¬³Ê¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò
diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index 3e88c371285..64ef9df83d5 100644
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 396056 -->
+<!-- English Revision: 396056:418355 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/content-negotiation.xml.ko b/docs/manual/content-negotiation.xml.ko
index e514767a850..22b50805d7a 100644
--- a/docs/manual/content-negotiation.xml.ko
+++ b/docs/manual/content-negotiation.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: 151408:396056 (outdated) -->
+<!-- English Revision: 151408:418355 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/content-negotiation.xml.meta b/docs/manual/content-negotiation.xml.meta
index d0e5cb623c2..b8337db2e83 100644
--- a/docs/manual/content-negotiation.xml.meta
+++ b/docs/manual/content-negotiation.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en
index 0786d12b122..73b44cb8d54 100644
--- a/docs/manual/misc/perf-tuning.html.en
+++ b/docs/manual/misc/perf-tuning.html.en
@@ -110,7 +110,7 @@
       Apache 1.3 this setting defaults to <code>Off</code>. If you need
       to have addresses in your log files resolved to hostnames, use the
       <code class="program"><a href="../programs/logresolve.html">logresolve</a></code>
-      program that comes with Apache, on one of the numerous log
+      program that comes with Apache, or one of the numerous log
       reporting packages which are available.</p>
 
       <p>It is recommended that you do this sort of postprocessing of
diff --git a/docs/manual/misc/perf-tuning.xml.ko b/docs/manual/misc/perf-tuning.xml.ko
index ab9182b9dda..f4df0db07f3 100644
--- a/docs/manual/misc/perf-tuning.xml.ko
+++ b/docs/manual/misc/perf-tuning.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:396056 (outdated) -->
+<!-- English Revision: 105989:418315 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
index e4219abcb00..29fdb4c169a 100644
--- a/docs/manual/mod/core.html.de
+++ b/docs/manual/mod/core.html.de
@@ -149,7 +149,7 @@ Servers</td></tr>
     für gewöhnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
     standardmäßig zurück. Handler, die Skripte bedienen,
     wie z.B. <a href="mod_cgi.html">cgi-script</a> und
-    <a href="mod_isapi.html">isapi-isa</a>, sind im Allgemeinen darauf
+    <a href="mod_isapi.html">isapi-handler</a>, sind im Allgemeinen darauf
     voreingestellt, <code>PATH_INFO</code> zu akzeptieren.</dd>
     </dl>
 
diff --git a/docs/manual/mod/core.html.ja.euc-jp b/docs/manual/mod/core.html.ja.euc-jp
index 80027fe6f55..31a6b9b0f68 100644
--- a/docs/manual/mod/core.html.ja.euc-jp
+++ b/docs/manual/mod/core.html.ja.euc-jp
@@ -186,7 +186,7 @@
     <dt><code>Default</code></dt><dd>³¤­¤Î¥Ñ¥¹Ì¾¾ðÊó¤Î°·¤¤¤Ï¥ê¥¯¥¨¥¹¥È¤Î
     <a href="../handler.html">¥Ï¥ó¥É¥é</a>¤Ç·è¤Þ¤ê¤Þ¤¹¡£
     ÉáÄ̤Υե¡¥¤¥ë¤Î¤¿¤á¤Î¥³¥¢¥Ï¥ó¥É¥é¤Î¥Ç¥Õ¥©¥ë¥È¤Ï <code>PATH_INFO</code> ¤òµñÈݤ·¤Þ¤¹¡£
-    <a href="mod_cgi.html">cgi-script</a> ¤ä <a href="mod_isapi.html">isapi-isa</a> ¤Î¤è¤¦¤Ë¥¹¥¯¥ê¥×¥È¤ò°·¤¦¥Ï¥ó¥É¥é¤Ï
+    <a href="mod_cgi.html">cgi-script</a> ¤ä <a href="mod_isapi.html">isapi-handler</a> ¤Î¤è¤¦¤Ë¥¹¥¯¥ê¥×¥È¤ò°·¤¦¥Ï¥ó¥É¥é¤Ï
     °ìÈÌŪ¤Ë¥Ç¥Õ¥©¥ë¥È¤Ç <code>PATH_INFO</code> ¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£</dd>
     </dl>
 
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 7b4f619a63e..c76564bd20c 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:396056 (outdated) -->
+<!-- English Revision: 167959:417234 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index 6bcee2bfce5..42030d5fda9 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -260,4 +260,4 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 </div><div id="footer">
 <p class="apache">Copyright 1995-2006 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_isapi.html.ko.euc-kr b/docs/manual/mod/mod_isapi.html.ko.euc-kr
index ddde8f79772..ecc3a3f07ce 100644
--- a/docs/manual/mod/mod_isapi.html.ko.euc-kr
+++ b/docs/manual/mod/mod_isapi.html.ko.euc-kr
@@ -24,6 +24,8 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_isapi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>Windows¿ë ¾ÆÆÄÄ¡¿¡¼­ ISAPI Extension »ç¿ë</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>isapi_module</td></tr>
@@ -61,11 +63,11 @@
 <h2><a name="usage" id="usage">»ç¿ë¹ý</a></h2>
 
     <p>¼­¹ö¼³Á¤ÆÄÀÏ¿¡¼­ <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> Áö½Ã¾î¸¦ »ç¿ëÇÏ¿©
-    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-isa</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
+    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-handler</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
     .dll ÆÄÀÏÀ» ISAPI extensionÀ¸·Î ó¸®ÇÏ·Á¸é httpd.conf ÆÄÀÏ¿¡
     ´ÙÀ½°ú °°ÀÌ Ãß°¡ÇÑ´Ù.</p>
     <div class="example"><p><code>
-        AddHandler isapi-isa .dll
+        AddHandler isapi-handler .dll
     </code></p></div>
 
     <p>¾ÆÆÄÄ¡ ¼­¹ö´Â ¿äûÇÑ ¸ðµâÀ» ¸Þ¸ð¸®¿¡ °è¼Ó µÑ ¼ö ¾ø´Ù.
diff --git a/docs/manual/mod/mod_isapi.xml.ko b/docs/manual/mod/mod_isapi.xml.ko
index c3f545f6a8f..989d7de7a84 100644
--- a/docs/manual/mod/mod_isapi.xml.ko
+++ b/docs/manual/mod/mod_isapi.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 396056 -->
+<!-- English Revision: 396056:417234 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_isapi.xml.meta b/docs/manual/mod/mod_isapi.xml.meta
index 893c0ffa9e8..3563ddc172d 100644
--- a/docs/manual/mod/mod_isapi.xml.meta
+++ b/docs/manual/mod/mod_isapi.xml.meta
@@ -7,6 +7,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index ce632221169..76f6fada035 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -102,9 +102,8 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
-        AuthLDAPEnabled on<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one<br />
-        AuthLDAPAuthoritative on<br />
+        AuthzLDAPAuthoritative off<br />
         require valid-user<br />
       </span>
       &lt;/Location&gt;
@@ -231,9 +230,8 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
-        AuthLDAPEnabled on<br />
         AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
-        AuthLDAPAuthoritative on<br />
+        AuthzLDAPAuthoritative off<br />
         require valid-user<br />
       </span>
       &lt;/Location&gt;
@@ -252,9 +250,8 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
-        AuthLDAPEnabled on<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS<br />
-        AuthLDAPAuthoritative on<br />
+        AuthzLDAPAuthoritative off<br />
         require valid-user<br />
       </span>
       &lt;/Location&gt;
@@ -304,10 +301,9 @@ by other LDAP modules</td></tr>
                 Order deny,allow<br />
                 Deny from all<br />
                 Allow from yourdomain.example.com<br />
-                AuthLDAPEnabled on<br />
                 LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
-                AuthLDAPAuthoritative on<br />
+                AuthzLDAPAuthoritative off<br />
                 require valid-user<br />
             </span>
             &lt;/Location&gt;
@@ -371,11 +367,10 @@ by other LDAP modules</td></tr>
                 Order deny,allow<br />
                 Deny from all<br />
                 Allow from yourdomain.example.com<br />
-                AuthLDAPEnabled on<br />
                 LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
                 LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
-                AuthLDAPAuthoritative on<br />
+                AuthzLDAPAuthoritative off<br />
                 require valid-user<br />
             </span>
             &lt;/Location&gt;
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 52f7458c500..d58d2f8b926 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -1405,34 +1405,38 @@ cannot use <code>$N</code> in the substitution string!
         </li>
       </ul>
 
-<div class="note"><h3>Note: Enabling rewrites in per-directory context</h3>
- To enable the rewrite engine
-          for per-directory configuration files you need to set
-          ``<code>RewriteEngine On</code>'' in these files
-          <strong>and</strong> ``<code>Options
-          FollowSymLinks</code>'' must be enabled. If your
-          administrator has disabled override of
-          <code>FollowSymLinks</code> for a user's directory, then
-          you cannot use the rewrite engine. This restriction is
-          required for security reasons.
-</div>
-
-<div class="note"><h3>Note: Pattern matching in per-directory context</h3> 
-	Never forget that <em>Pattern</em> is
-applied to a complete URL in per-server configuration
-files. <strong>However, in per-directory configuration files, the
+<div class="note"><h3>Per-directory Rewrites</h3>
+ 
+<p>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files.  To enable the
+rewrite engine for these files you need to set
+"<code>RewriteEngine On</code>" <strong>and</strong>
+"<code>Options FollowSymLinks</code>" must be enabled. If your
+administrator has disabled override of <code>FollowSymLinks</code> for
+a user's directory, then you cannot use the rewrite engine. This
+restriction is required for security reasons.</p>
+
+<p>When using the rewrite engine in <code>.htaccess</code> files the
 per-directory prefix (which always is the same for a specific
 directory) is automatically <em>removed</em> for the pattern matching
 and automatically <em>added</em> after the substitution has been
-done.</strong> This feature is essential for many sorts of rewriting - 
-without this, you would always have to match the parent
-directory, which is not always possible.
-
-            <p>There is one exception: If a substitution string
-            starts with ``<code>http://</code>'', then the directory
-            prefix will <strong>not</strong> be added ,and an
-            external redirect (or proxy throughput, if using flag
-            <strong>P</strong>) is forced!</p>
+done. This feature is essential for many sorts of rewriting; without
+this, you would always have to match the parent directory, which is
+not always possible.  There is one exception: If a substitution string
+starts with <code>http://</code>, then the directory prefix will
+<strong>not</strong> be added, and an external redirect (or proxy
+throughput, if using flag <strong>P</strong>) is forced.  See the
+<code class="directive"><a href="#rewritebase">RewriteBase</a></code> directive for
+more information.</p>
+
+<p>The rewrite engine may also be used in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections with the same
+prefix-matching rules as would be applied to <code>.htaccess</code>
+files.  It is usually simpler, however, to avoid the prefix substitution
+complication by putting the rewrite rules in the main server or
+virtual host context, rather than in a <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> section.</p>
+
+<p>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> sections, this
+should never be necessary and is unsupported.</p>
+
 </div>
 
 <div class="note"><h3>Note: Substitution of Absolute URLs</h3>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 62f2bd2d767..ff492ec4681 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -263,7 +263,7 @@ HTTP-Response-Headern</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
 <tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 963fe30b71d..0e25d5383b4 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -260,7 +260,7 @@ switch before dumping core</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index c1225ab6fc1..a48dd5dac8b 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -263,7 +263,7 @@ switch before dumping core</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/mod/quickreference.html.ja.euc-jp b/docs/manual/mod/quickreference.html.ja.euc-jp
index c1c2b922f3c..4633f636cf5 100644
--- a/docs/manual/mod/quickreference.html.ja.euc-jp
+++ b/docs/manual/mod/quickreference.html.ja.euc-jp
@@ -244,7 +244,7 @@ authenticating the user if this one fails</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬ DAV ¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¤ò°Ý»ý¤¹¤ëºÇ¾®»þ´Ö¤Ç¤¹¡£
 </td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index c8e5a4c0fa0..5d2dd1029e0 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -230,7 +230,7 @@ switch before dumping core</td></tr>
 <tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV Àá±Ý µ¥ÀÌÅͺ£À̽º À§Ä¡</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¼­¹ö°¡ DAV ÀÚ¿ø¿¡ ´ëÇØ À¯ÁöÇÒ Àá±ÝÀÇ Ãּҽð£</td></tr>
 <tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/mod/quickreference.html.ru.koi8-r b/docs/manual/mod/quickreference.html.ru.koi8-r
index b5cc31eb115..6508e5d4de4 100644
--- a/docs/manual/mod/quickreference.html.ru.koi8-r
+++ b/docs/manual/mod/quickreference.html.ru.koi8-r
@@ -262,7 +262,7 @@ switch before dumping core</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustainednumber of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index 82874ddd228..9ac80ca4523 100644
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -132,29 +132,38 @@
         <code>openssl</code>, obtained from <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
         or the abs project (<code>ab.exe</code> with SSL support.) To prepare OpenSSL
         for both <code>release</code> and <code>debug</code> builds of Apache, and
-        disable the patent protected features in 0.9.7,  you might use the following
+        disable the patent protected features in OpenSSL,  you might use the following
         build commands:</p>
 
         <div class="example"><p><code>
           perl Configure VC-WIN32<br />
           perl util\mkfiles.pl &gt;MINFO<br />
-          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile<br />
+          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.rel<br />
           perl util\mk1mf.pl dll debug no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.dbg<br />
           perl util\mkdef.pl 32 libeay no-asm no-mdc2 no-rc5 no-idea &gt;ms\libeay32.def<br />
           perl util\mkdef.pl 32 ssleay no-asm no-mdc2 no-rc5 no-idea &gt;ms\ssleay32.def<br />
-          nmake<br />
+          nmake -f makefile.rel<br />
           nmake -f makefile.dbg
         </code></p></div>
 
+        <p>Note; you can use the scripts in the <code>ms\</code> subdirectory, however,
+        it's rather tricky to force <code>ms\do_masm.bat</code>, for example, to perform
+        the patent encumberances as mentioned above.  Patches to add the $* argument list
+        to the appropriate .bat lines in these scripts aren't incorporated, thus far.</p>
       </li>
 
       <li>
-        <p>[Optional] zlib sources (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
+        <p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
         <p>Zlib must be installed into a <code>srclib</code> subdirectory named
-        <code>zlib</code>, however those sources need not be compiled. The build system
-        will compile the compression sources directly into the <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>
-        module. Zlib can be obtained from <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a> -- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is
-        confirmed to build correctly with version 1.1.4.</p>
+        <code>zlib</code>.  This must be built in-place.  Zlib can be obtained 
+        from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
+        <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with 
+        version 1.2.3.</p>
+
+        <div class="example"><p><code>
+          nmake -f win32\Makefile.msc<br />
+          nmake -f win32\Makefile.msc test
+        </code></p></div>
       </li>
 
     </ul>
diff --git a/docs/manual/platform/win_compiling.xml.ko b/docs/manual/platform/win_compiling.xml.ko
index 3c0909b0127..9734e3d23f6 100644
--- a/docs/manual/platform/win_compiling.xml.ko
+++ b/docs/manual/platform/win_compiling.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:396056 (outdated) -->
+<!-- English Revision: 105989:419637 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index f45a6b6ab6a..19db0dd8bae 100644
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -37,7 +37,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#graceful">Graceful Restart</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#hup">Restart Now</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#gracefulstop">Graceful Stop</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li><li><a href="invoking.html">Starting</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="introduction" id="introduction">Introduction</a></h2>
@@ -50,10 +50,11 @@
     but you should not send signals to any of them except the parent,
     whose pid is in the <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>. That is to say you
     shouldn't ever need to send signals to any process except the
-    parent. There are three signals that you can send the parent:
+    parent. There are four signals that you can send the parent:
     <code><a href="#term">TERM</a></code>,
+    <code><a href="#graceful">USR1</a></code>,
     <code><a href="#hup">HUP</a></code>, and
-    <code><a href="#graceful">USR1</a></code>, which
+    <code><a href="#gracefulstop">WINCH</a></code>, which
     will be described in a moment.</p>
 
     <p>To send a signal to the parent you should issue a command
diff --git a/docs/manual/stopping.xml.de b/docs/manual/stopping.xml.de
index 1896a20c6e5..14c1bc940c9 100644
--- a/docs/manual/stopping.xml.de
+++ b/docs/manual/stopping.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 396056:413452 (outdated) -->
+<!-- English Revision: 396056:418353 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/stopping.xml.es b/docs/manual/stopping.xml.es
index 322b8982800..2215e5a817c 100644
--- a/docs/manual/stopping.xml.es
+++ b/docs/manual/stopping.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:413452 (outdated) -->
+<!-- English Revision: 105989:418353 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 6679ed8f6ec..021c121505a 100644
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:413452 (outdated) -->
+<!-- English Revision: 151408:418353 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/stopping.xml.ko b/docs/manual/stopping.xml.ko
index dfa616c2d81..a6b9c2a2066 100644
--- a/docs/manual/stopping.xml.ko
+++ b/docs/manual/stopping.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:413452 (outdated) -->
+<!-- English Revision: 105989:418353 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,