From: Eric Covener <covener@apache.org>
Date: Wed, 8 Mar 2017 00:40:30 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~579
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e7dcf18edd157587777088716fa19ebea6e294d;p=thirdparty%2Fapache%2Fhttpd.git

xforms



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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 912fbc88b79..283230c7f06 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -426,7 +426,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre>
 &lt;/Location&gt;</pre>
 
 
-      <p> The "no-proxy" environment variable can be set to disable 
+      <p> In 2.4.26 and later, the "no-proxy" environment variable can be set to disable 
       <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> processing the current request.
       This variable should be set with <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>, as <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>
       is not evaluated early enough.</p>
@@ -1112,7 +1112,7 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
       specific location will take precedence.</p>
 
       <p>For the same reasons, exclusions must come <em>before</em> the
-      general <code class="directive">ProxyPass</code> directives. The "no-proxy"
+      general <code class="directive">ProxyPass</code> directives. In 2.4.26 and later, the "no-proxy"
       environment variable is an alternative to exclusions, and is the only
       way to configure an exclusion of a <code class="directive">ProxyPass</code>
       directive in <code class="directive"><a href="../mod/core.html#location">Location</a></code> context. 
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index cbec4a3f0d4..4b0971dab35 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" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1781328 -->
+<!-- English Revision: 1781328:1785907 (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 def8cc2b1e9..d5e1413d3bf 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:1781328 (outdated) -->
+<!-- English Revision: 344971:1785907 (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>