From: Lucien Gentis <lgentis@apache.org>
Date: Sat, 13 Feb 2016 14:43:40 +0000 (+0000)
Subject: Rebuild.
X-Git-Tag: 2.2.32~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1065e93b5d243602d4e9d41493fa27da5e60d52d;p=thirdparty%2Fapache%2Fhttpd.git

Rebuild.


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

diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index a48e82c475f..11b8d391dce 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -1054,6 +1054,11 @@ l'espace d'URLs du serveur local</td></tr>
 
     </div> 
 
+    <div class="warning"><h3>Ordre d'évaluation des directives ProxyPass et RewriteRule</h3>
+      <p>Les directives <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
+      sont évaluées avant les directives <code class="directive"><a href="#proxypass">ProxyPass</a></code>.</p>
++    </div>
+
     <p><strong>ProxyPass <code>clé=valeur</code> Paramètres</strong></p>
 
     <p>Depuis la version 2.1 du serveur HTTP Apache, mod_proxy supporte
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index f0185375d44..38a79fdda73 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 outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 6d02ba0f336..a03f396a474 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -130,6 +130,9 @@ fonctionnalit
       du module <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code> a été fusionnée avec la
       directive <code class="directive"><a href="./mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
       et appartient maintenant au module <code class="module"><a href="./mod/mod_authn_file.html">mod_authn_file</a></code>.</li>
+
+      <li>Les directives <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>sont évaluées avant les
+      directives <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code>.</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.meta b/docs/manual/upgrading.xml.meta
index 9cce22bb501..814ac637ea9 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 outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>