xforms

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

diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index a3395d7bb6baec20b10f2fccea89124aec455601..2affdabe4c72ab9ef1c662ed2ccb31d13aebcfc6 100644 (file)
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -493,9 +493,8 @@ manager</td></tr>
     <code class="directive">&lt;LocationMatch&gt;</code> sections are processed
     before globally defined <code class="directive">CacheEnable</code> directives.</p>
 
-    <p>When acting as a forward proxy server, <var>url-string</var> can
-    also be used to specify remote sites and proxy protocols which
-    caching should be enabled for.</p>
+    <p>When acting as a forward proxy server, <var>url-string</var> must 
+    minimally begin with a protocol for which caching should be enabled.</p>
 
     <pre class="prettyprint lang-config">
 # Cache content (normal handler only)
@@ -510,13 +509,13 @@ CacheQuickHandler off
     CacheEnable disk
 &lt;/LocationMatch&gt;
 
-# Cache proxied url's (normal or quick handler)
+# Cache all but forward proxy url's (normal or quick handler)
 CacheEnable  disk  /
 
 # Cache FTP-proxied url's (normal or quick handler)
 CacheEnable  disk  ftp://
 
-# Cache content from www.example.org (normal or quick handler)
+# Cache forward proxy content from www.example.org (normal or quick handler)
 CacheEnable  disk  http://www.example.org/
     </pre>
 

diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 6bc4aca785205deda0a4abd2a633ebed70029044..5b16f53193c8eb4e41a43867bbb564ce4e97b389 100644 (file)
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -239,6 +239,12 @@ Allow from example.org
         <code>jsessionid</code>.
         </li>
 
+        <li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>: The second parameter to 
+        <code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code> only
+        matches forward proxy content if it begins with the correct
+        protocol. In 2.2 and earlier, a parameter of '/' matched all
+        content.</li>
+
         <li><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code>: <code class="directive"><a href="./mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code> is now
         consistently a per-directory setting only.  If you use this
         directive, review your configuration to make sure it is

diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index 1d2a68a225aa2d153bd52b089461d6b5ec809b09..aba29996bbd699aa0af1827543fc41d3c2d9af24 100644 (file)
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>