From: Jim Jagielski <jim@apache.org>
Date: Tue, 27 Aug 2013 22:28:59 +0000 (+0000)
Subject: xforms
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e7b9c8cda7ff16eb547d2d589c88a3d1249ce94;p=thirdparty%2Fapache%2Fhttpd.git

xforms


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

diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en
index 8f330d58892..aed595cb558 100644
--- a/docs/manual/caching.html.en
+++ b/docs/manual/caching.html.en
@@ -180,6 +180,10 @@
               server processing is bypassed. This mode however also bypasses the
               authentication and authorization phases of server processing, so
               this mode should be chosen with care when this is important.</p>
+  
+              <p> Requests with an "Authorization" header (for example, HTTP Basic
+              Authentication) are neither cacheable nor served from the cache 
+              when <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> is running in this phase.</p>
           </dd>
           <dt>Normal handler phase</dt>
           <dd>
diff --git a/docs/manual/caching.html.fr b/docs/manual/caching.html.fr
index f7287ea8ad2..3474cbcbfd6 100644
--- a/docs/manual/caching.html.fr
+++ b/docs/manual/caching.html.fr
@@ -25,6 +25,8 @@
 <a href="./fr/caching.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./tr/caching.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
     <p>Ce document complète la documentation de référence des modules
     <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>,
diff --git a/docs/manual/caching.xml.fr b/docs/manual/caching.xml.fr
index c3dd66ccf23..2c6d0ac8902 100644
--- a/docs/manual/caching.xml.fr
+++ b/docs/manual/caching.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1331581 -->
+<!-- English Revision: 1331581:1516872 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/caching.xml.meta b/docs/manual/caching.xml.meta
index 22406e7caf5..041ab16f95e 100644
--- a/docs/manual/caching.xml.meta
+++ b/docs/manual/caching.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/caching.xml.tr b/docs/manual/caching.xml.tr
index 9dc4342bd98..f02327f607a 100644
--- a/docs/manual/caching.xml.tr
+++ b/docs/manual/caching.xml.tr
@@ -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.tr.xsl"?>
-<!-- English Revision: 1291840:1331581 (outdated) -->
+<!-- English Revision: 1291840:1516872 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_authnz_fcgi.html.en b/docs/manual/mod/mod_authnz_fcgi.html.en
index ac42a7a16bf..91a382d0329 100644
--- a/docs/manual/mod/mod_authnz_fcgi.html.en
+++ b/docs/manual/mod/mod_authnz_fcgi.html.en
@@ -393,6 +393,10 @@ Require FooAuthnz
       authorizer handles separate <em>authn</em> and <em>authz</em>
       phases then two connections will be used.</dd>
 
+      <dt>URI Mapping</dt>
+      <dd>URIs from clients can't be mapped, such as with the <code class="directive">
+      ProxyPass</code> used with FastCGI responders.</dd>
+
     </dl>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index 037a9bdc7ff..a3395d7bb6b 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -265,14 +265,14 @@ LoadModule cache_module modules/mod_cache.so
   <p>While this mode offers the best performance, the administrator may find that
   under certain circumstances they may want to perform further processing on the
   request after the request is cached, such as to inject personalisation into the
-  cached page, or to apply authorisation restrictions to the content. Under these
+  cached page, or to apply authorization restrictions to the content. Under these
   circumstances, an administrator is often forced to place independent reverse
   proxy servers either behind or in front of the caching server to achieve this.</p>
 
   <p>To solve this problem the <code class="directive"><a href="#cachequickhandler&#10;  ">CacheQuickHandler
   </a></code> directive can be set to <strong>off</strong>, and the server will
   process all phases normally handled by a non-cached request, including the
-  <strong>authentication and authorisation</strong> phases.</p>
+  <strong>authentication and authorization</strong> phases.</p>
 
   <p>In addition, the administrator may optionally specify the <strong>precise point
   within the filter chain</strong> where caching is to take place by adding the
@@ -599,8 +599,7 @@ CacheHeader on
     <code class="directive">CacheIgnoreCacheControl</code> directive allows this
     behavior to be overridden.  <code class="directive">CacheIgnoreCacheControl On</code>
     tells the server to attempt to serve the resource from the cache even
-    if the request contains no-cache header values.  Resources requiring
-    authorization will <em>never</em> be cached.</p>
+    if the request contains no-cache header values.</p>  
 
     <pre class="prettyprint lang-config">
       CacheIgnoreCacheControl On
@@ -961,7 +960,7 @@ CacheLock on
     <p>When disabled, the cache operates as a normal handler, and is subject to
     the full set of phases when handling a server request. While this mode is
     slower than the default, it allows the cache to be used in cases where full
-    processing is required, such as when content is subject to authorisation.</p>
+    processing is required, such as when content is subject to authorization.</p>
 
     <pre class="prettyprint lang-config">
 # Run cache as a normal handler
@@ -1052,8 +1051,7 @@ CacheStaleOnError on
        <code class="directive">CacheStoreNoStore</code> directive allows this
        behavior to be overridden.  <code class="directive">CacheStoreNoStore</code> On
        tells the server to attempt to cache the resource even if it contains
-       no-store header values.  Resources requiring authorization will
-       <em>never</em> be cached.</p>
+       no-store header values.</p>
 
     <pre class="prettyprint lang-config">
       CacheStoreNoStore On
@@ -1088,8 +1086,7 @@ CacheStaleOnError on
        directive allows this behavior to be overridden.
        <code class="directive">CacheStorePrivate</code> On
        tells the server to attempt to cache the resource even if it contains
-       private header values.  Resources requiring authorization will
-       <em>never</em> be cached.</p>
+       private header values.</p>
 
     <pre class="prettyprint lang-config">
       CacheStorePrivate On
diff --git a/docs/manual/mod/mod_cache.html.fr b/docs/manual/mod/mod_cache.html.fr
index 88e78f53d16..29aea327113 100644
--- a/docs/manual/mod/mod_cache.html.fr
+++ b/docs/manual/mod/mod_cache.html.fr
@@ -29,6 +29,8 @@
 <a href="../ja/mod/mod_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Filtre de mise en cache HTTP conforme à la RFC 2616</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>cache_module</td></tr>
diff --git a/docs/manual/mod/mod_cache.xml.fr b/docs/manual/mod/mod_cache.xml.fr
index e383016a9bf..cfa67cec9af 100644
--- a/docs/manual/mod/mod_cache.xml.fr
+++ b/docs/manual/mod/mod_cache.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1505986 -->
+<!-- English Revision: 1505986:1517405 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja
index e9ce4e431d7..bab3afb134f 100644
--- a/docs/manual/mod/mod_cache.xml.ja
+++ b/docs/manual/mod/mod_cache.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 504183:1505986 (outdated) -->
+<!-- English Revision: 504183:1517405 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko
index 85146e9dcea..d5c80646eba 100644
--- a/docs/manual/mod/mod_cache.xml.ko
+++ b/docs/manual/mod/mod_cache.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: 105569:1505986 (outdated) -->
+<!-- English Revision: 105569:1517405 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_cache.xml.meta b/docs/manual/mod/mod_cache.xml.meta
index 92f1aa14034..29181a9f486 100644
--- a/docs/manual/mod/mod_cache.xml.meta
+++ b/docs/manual/mod/mod_cache.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en
index 3338b34d240..661a81eba57 100644
--- a/docs/manual/mod/mod_deflate.html.en
+++ b/docs/manual/mod/mod_deflate.html.en
@@ -61,42 +61,26 @@ client</td></tr>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="recommended" id="recommended">Sample Configurations</a></h2>
-    <p>This is a simple sample configuration for the impatient.</p>
+    <div class="warning"><h3>Compression and TLS</h3>
+        <p>Some web applications are vulnerable to an information disclosure
+        attack when a TLS connection carries deflate compressed data. For more
+        information, review the details of the "BREACH" family of attacks.</p>
+    </div>
+    <p>This is a simple configuration that compresses common text-based content types.</p>
 
     <div class="example"><h3>Compress only a few types</h3><pre class="prettyprint lang-config">
-      AddOutputFilterByType DEFLATE text/html text/plain text/xml
-      </pre>
-</div>
-
-    <p>The following configuration, while resulting in more compressed content,
-    is also much more complicated.  Do not use this unless you fully understand
-    all the configuration details.</p>
-
-    <div class="example"><h3>Compress everything except images</h3><pre class="prettyprint lang-config">
-&lt;Location /&gt;
-    # Insert filter
-    SetOutputFilter DEFLATE
-    
-    # Netscape 4.x has some problems...
-    BrowserMatch ^Mozilla/4         gzip-only-text/html
-    
-    # Netscape 4.06-4.08 have some more problems
-    BrowserMatch ^Mozilla/4\.0[678] no-gzip
-    
-    # MSIE masquerades as Netscape, but it is fine
-    BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html
-    # Don't compress images
-    SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
-    
-    # Make sure proxies don't deliver the wrong content
-    Header append Vary User-Agent env=!dont-vary
-&lt;/Location&gt;
+      AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript
       </pre>
 </div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="enable" id="enable">Enabling Compression</a></h2>
+    <div class="warning"><h3>Compression and TLS</h3>
+        <p>Some web applications are vulnerable to an information disclosure
+        attack when a TLS connection carries deflate compressed data. For more
+        information, review the details of the "BREACH" family of attacks.</p>
+    </div>
 
     <h3><a name="output" id="output">Output Compression</a></h3>
       <p>Compression is implemented by the <code>DEFLATE</code>
@@ -105,16 +89,11 @@ client</td></tr>
       is placed:</p>
 
       <pre class="prettyprint lang-config">
-        SetOutputFilter DEFLATE
+SetOutputFilter DEFLATE
+SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip 
       </pre>
 
 
-      <p>Some popular browsers cannot handle compression of all content
-      so you may want to set the <code>gzip-only-text/html</code> note to
-      <code>1</code> to only allow html files to be compressed (see
-      below). If you set this to <em>anything but <code>1</code></em> it
-      will be ignored.</p>
-
       <p>If you want to restrict the compression to particular MIME types
       in general, you may use the <code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code> directive. Here is an example of
       enabling compression only for the html files of the Apache
@@ -127,36 +106,6 @@ client</td></tr>
       </pre>
 
 
-      <p>For browsers that have problems even with compression of all file
-      types, use the <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code> directive to set the <code>no-gzip</code>
-      note for that particular browser so that no compression will be
-      performed. You may combine <code>no-gzip</code> with <code>gzip-only-text/html</code> to get the best results. In that case
-      the former overrides the latter. Take a look at the following
-      excerpt from the <a href="#recommended">configuration example</a>
-      defined in the section above:</p>
-
-      <pre class="prettyprint lang-config">
-BrowserMatch ^Mozilla/4         gzip-only-text/html
-BrowserMatch ^Mozilla/4\.0[678] no-gzip
-BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html
-      </pre>
-
-
-      <p>At first we probe for a <code>User-Agent</code> string that
-      indicates a Netscape Navigator version of 4.x. These versions
-      cannot handle compression of types other than
-      <code>text/html</code>. The versions 4.06, 4.07 and 4.08 also
-      have problems with decompressing html files. Thus, we completely
-      turn off the deflate filter for them.</p>
-
-      <p>The third <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
-      directive fixes the guessed identity of the user agent, because
-      the Microsoft Internet Explorer identifies itself also as "Mozilla/4"
-      but is actually able to handle requested compression. Therefore we
-      match against the additional string "MSIE" (<code>\b</code> means
-      "word boundary") in the <code>User-Agent</code> Header and turn off
-      the restrictions defined before.</p>
-
       <div class="note"><h3>Note</h3>
         The <code>DEFLATE</code> filter is always inserted after RESOURCE
         filters like PHP or SSI. It never touches internal subrequests.
diff --git a/docs/manual/mod/mod_deflate.html.fr b/docs/manual/mod/mod_deflate.html.fr
index 57152bf1a52..87031f70169 100644
--- a/docs/manual/mod/mod_deflate.html.fr
+++ b/docs/manual/mod/mod_deflate.html.fr
@@ -29,6 +29,8 @@
 <a href="../ja/mod/mod_deflate.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Comprime le contenu avant de le servir au
 client</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
diff --git a/docs/manual/mod/mod_deflate.xml.fr b/docs/manual/mod/mod_deflate.xml.fr
index 9ec60c89c7a..6c098a94c48 100644
--- a/docs/manual/mod/mod_deflate.xml.fr
+++ b/docs/manual/mod/mod_deflate.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1421821 -->
+<!-- English Revision: 1421821:1517589 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja
index 2b5df49bccf..b83e25b80a2 100644
--- a/docs/manual/mod/mod_deflate.xml.ja
+++ b/docs/manual/mod/mod_deflate.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1421821 (outdated) -->
+<!-- English Revision: 420990:1517589 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_deflate.xml.ko b/docs/manual/mod/mod_deflate.xml.ko
index ce7f37bd055..4806f45a12e 100644
--- a/docs/manual/mod/mod_deflate.xml.ko
+++ b/docs/manual/mod/mod_deflate.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: 151408:1421821 (outdated) -->
+<!-- English Revision: 151408:1517589 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_deflate.xml.meta b/docs/manual/mod/mod_deflate.xml.meta
index 1d5b04c7a1b..3efa67dca31 100644
--- a/docs/manual/mod/mod_deflate.xml.meta
+++ b/docs/manual/mod/mod_deflate.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 6db90c8342a..2c6780e0149 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -229,7 +229,7 @@
 <tr><td><code>%O</code></td>
         <td>Bytes sent, including headers. Cannot be zero. You need to
         enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
-<tr class="odd"><td><code>%C</code></td>
+<tr class="odd"><td><code>%S</code></td>
         <td>Bytes transferred (received and sent), including request and headers,
         cannot be zero. This is the combination of %I and %O. You need to
         enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 4fdcf695320..cf1f2408cc0 100644
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 579425:1510842 (outdated) -->
+<!-- English Revision: 579425:1517386 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index 74f7b53fa69..4bf1a48374f 100644
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.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: 105989:1510842 (outdated) -->
+<!-- English Revision: 105989:1517386 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.tr b/docs/manual/mod/mod_log_config.xml.tr
index b435848eb91..98dbc371515 100644
--- a/docs/manual/mod/mod_log_config.xml.tr
+++ b/docs/manual/mod/mod_log_config.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1310330:1510842 (outdated) -->
+<!-- English Revision: 1310330:1517386 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_logio.html.en b/docs/manual/mod/mod_logio.html.en
index e160ffdaa12..549ac6edb7d 100644
--- a/docs/manual/mod/mod_logio.html.en
+++ b/docs/manual/mod/mod_logio.html.en
@@ -79,7 +79,7 @@
         zero.</td></tr>
 <tr class="odd"><td><code>%O</code></td>
         <td>Bytes sent, including headers, cannot be zero.</td></tr>
-<tr><td><code>%C</code></td>
+<tr><td><code>%S</code></td>
         <td>Bytes transferred (received and sent), including request and headers,
         cannot be zero. This is the combination of %I and %O.</td></tr>
 </table>
diff --git a/docs/manual/mod/mod_logio.xml.ja b/docs/manual/mod/mod_logio.xml.ja
index d5dd5a3b9c8..756a6c0f751 100644
--- a/docs/manual/mod/mod_logio.xml.ja
+++ b/docs/manual/mod/mod_logio.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1484910 (outdated) -->
+<!-- English Revision: 420990:1517386 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_logio.xml.ko b/docs/manual/mod/mod_logio.xml.ko
index f14d0f0cec9..a47d46f52c2 100644
--- a/docs/manual/mod/mod_logio.xml.ko
+++ b/docs/manual/mod/mod_logio.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: 420990:1484910 (outdated) -->
+<!-- English Revision: 420990:1517386 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_logio.xml.tr b/docs/manual/mod/mod_logio.xml.tr
index 9fa96fad0cb..645c2a4a6dd 100644
--- a/docs/manual/mod/mod_logio.xml.tr
+++ b/docs/manual/mod/mod_logio.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 630289:1484910 (outdated) -->
+<!-- English Revision: 630289:1517386 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 95285e3d328..d076b9c8c5e 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -72,6 +72,7 @@
         <tr><td>HTTP/0.9, HTTP/1.0, and
           HTTP/1.1</td><td><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code></td></tr>
         <tr><td>SCGI</td><td><code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code></td></tr>
+        <tr><td>WS and WSS (Web-sockets)</td><td><code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code></td></tr>
         </table>
       </li>
     </ul>
@@ -138,6 +139,7 @@
 <li><code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
 <li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
 </ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
@@ -715,6 +717,18 @@ NoProxy         .example.com 192.168.112.0/21
     </pre>
 
 
+    <div class="note"><h3>Differences from the Location configuration section</h3>
+      <p>A backend URL matches the configuration section if it begins with the 
+      the <var>wildcard-url</var> string, even if the last path segment in the
+      directive only matches a prefix of the backend URL.  For example, 
+      &lt;Proxy http://example.com/foo&gt; matches all of 
+      http://example.com/foo, http://example.com/foo/bar, and 
+      http://example.com/foobar.  The matching of the final URL differs
+      from the behavior of the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, which for purposes of this note 
+      treats the final path component as if it ended in a slash.</p>
+      <p>For more control over the matching, see <code class="directive">&lt;ProxyMatch&gt;</code>.</p>
+    </div>
+
 
 <h3>See also</h3>
 <ul>
@@ -980,9 +994,9 @@ through</td></tr>
     <code class="directive">ProxyPass</code>.</div>
 
     <p>Support for using a Unix Domain Socket is available by using a target
-    of <code>socket=percent-encoded-path</code>. For example, to target the
+    of <code>uds=percent-encoded-path</code>. For example, to target the
     UDS at /home/www/socket you would use
-    <code>http://socket=%2Fhome%2Fwww%2Fsocket</code></p>
+    <code>http://uds=%2Fhome%2Fwww%2Fsocket</code></p>
 
     <p>Suppose the local server has address <code>http://example.com/</code>;
     then</p>
@@ -1179,7 +1193,9 @@ ProxyPass /mirror/foo http://backend.example.com
     <tr><td>ping</td>
         <td>0</td>
         <td>Ping property tells the webserver to "test" the connection to
-        the backend before forwarding the request. For AJP, it causes
+        the backend before forwarding the request. For negative values
+        the test is a simple socket check, for positive values it's
+        a more functional check, dependent upon the protocol. For AJP, it causes
         <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>to send a <code>CPING</code>
         request on the ajp13 connection (implemented on Tomcat 3.3.2+, 4.1.28+
         and 5.0.13+). For HTTP, it causes <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index 7fd613d6b42..cfba74e3f9c 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -28,6 +28,8 @@
 <a href="../fr/mod/mod_proxy.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr>
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 5faed40375e..feb927ce8fb 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -69,6 +69,7 @@
         <tr><td>HTTP/0.9, HTTP/1.0, and
           HTTP/1.1</td><td><module>mod_proxy_http</module></td></tr>
         <tr><td>SCGI</td><td><module>mod_proxy_scgi</module></td></tr>
+        <tr><td>WS and WSS (Web-sockets)</td><td><module>mod_proxy_wstunnel</module></td></tr>
         </table>
       </li>
     </ul>
@@ -87,6 +88,7 @@
 <seealso><module>mod_proxy_ftp</module></seealso>
 <seealso><module>mod_proxy_http</module></seealso>
 <seealso><module>mod_proxy_scgi</module></seealso>
+<seealso><module>mod_proxy_wstunnel</module></seealso>
 <seealso><module>mod_proxy_balancer</module></seealso>
 <seealso><module>mod_ssl</module></seealso>
 
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index d8eef5d9a24..e338760c841 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1501913 -->
+<!-- English Revision: 1501913:1517406 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index da29f2d4115..ef1b4180871 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1501913 (outdated) -->
+<!-- English Revision: 344971:1517406 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index 38a79fdda73..f0185375d44 100644
--- a/docs/manual/mod/mod_proxy.xml.meta
+++ b/docs/manual/mod/mod_proxy.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>