From: Luca Toscano <elukey@apache.org>
Date: Mon, 8 Feb 2016 22:09:58 +0000 (+0000)
Subject: Documentation rebuild.
X-Git-Tag: 2.2.32~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c53b494d47724af1bfdfa451f46b0bcef9441793;p=thirdparty%2Fapache%2Fhttpd.git

Documentation rebuild.



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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index a39d381e430..91d417491ad 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -950,6 +950,11 @@ through</td></tr>
 
     </div> 
 
+    <div class="warning"><h3>Ordering ProxyPass and RewriteRule Directives</h3>
+      <p><code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives
+      are evaluated before <code class="directive"><a href="#proxypass">ProxyPass</a></code> ones.</p>
+    </div>
+
     <p><strong>ProxyPass <code>key=value</code> Parameters</strong></p>
 
     <p>In Apache HTTP Server 2.1 and later, mod_proxy supports pooled
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 8c1af115bb3..42ce9bc7686 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: 1696886 -->
+<!-- English Revision: 1696886:1729281 (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 9657409d3e1..04db0072db0 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: 1212598:1696886 (outdated) -->
+<!-- English Revision: 1212598:1729281 (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>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index e9b5e536eb8..a16aa491b97 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -117,6 +117,9 @@
       from <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code> has been merged with
       <code class="directive"><a href="./mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
       and is now part of <code class="module"><a href="./mod/mod_authn_file.html">mod_authn_file</a></code>.</li>
+
+      <li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives
+      are evaluated before <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> ones.</li>
     </ul>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de
index 1a15c2cd612..aa87a4c5a2c 100644
--- a/docs/manual/upgrading.xml.de
+++ b/docs/manual/upgrading.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: 333065:586771 (outdated) -->
+<!-- English Revision: 333065:1729281 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index a2038306754..2e537229d7d 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 586771 -->
+<!-- English Revision: 586771:1729281 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 <!-- $LastChangedRevision: 2007102101 $ -->
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index d158dfd5b8c..a0071643d73 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -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.en.xsl"?>
-<!-- English Revision: 586771  -->
+<!-- English Revision: 586771:1729281 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index 24adb31abcf..9cce22bb501 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">fr</variant>
+    <variant outdated="yes">ja</variant>
   </variants>
 </metafile>