documentation rebuild

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 77ba17e8234fcb8c33836e8c7f0981587da57f79..cbdaea57f56b35e81bcf63bb8bdd2c4c1fe00d45 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1503,13 +1503,15 @@ ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsessionid nofail
     httpd 2.4.1 and later) prevents this.</p>
 
     <p>The optional <var>interpolate</var> keyword, in combination with
-    <code class="directive">ProxyPassInterpolateEnv</code>, causes the ProxyPass
+    <code class="directive"><a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></code>, causes the ProxyPass
     to interpolate environment variables, using the syntax
     <var>${VARNAME}</var>.  Note that many of the standard CGI-derived
     environment variables will not exist when this interpolation happens,
     so you may still have to resort to <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-    for complex rules.  Also note that interpolation is not supported
-    within the scheme/hostname/port portion of a URL. Dynamic determination of
+    for complex rules. Also note that interpolation is supported
+    within the scheme/hostname/port portion of a URL only for variables that
+    are available when the directive is parsed 
+    (like <code class="directive"><a href="../mod/core.html#define">Define</a></code>). Dynamic determination of
     those fields can be accomplished with <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.
     The following example describes how to use <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
     to dynamically set the scheme to http or https:</p>
@@ -1573,12 +1575,17 @@ ProxyPassReverse  "/mirror/foo/" "https://backend.example.com/"</pre>
     and causes them to substitute the value of an environment
     variable <code>varname</code> for the string <code>${varname}</code>
     in configuration directives if the <var>interpolate</var> option is set.</p>
-    <p>The scheme/hostname/port portion of <code class="directive">ProxyPass</code> cannot
-    contain variables, please consider using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> instead.</p>
-    <p>Keep this turned off (for server performance) unless you need it!
+    <p>The scheme/hostname/port portion of <code class="directive">ProxyPass</code> may
+    contain variables, but only the ones available when the directive is parsed
+    (for example, using <code class="directive"><a href="../mod/core.html#define">Define</a></code>).
+    For all the other use cases, please consider using
+    <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> instead.</p>
+    <div class="warning"><h3>Performance warning</h3>
+    <p>Keep this turned off unless you need it!
     Adding variables to <code class="directive">ProxyPass</code> for example may lead to
-    using the default mod_proxy's workers configured (that don't allow any fine
+    the use of the default mod_proxy's workers configured (that don't allow any fine
     tuning like connections reuse, etc..).</p>
+    </div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index ccaf2f38bdd6de758cdadac59c6febf613ba3418..c8c4ffa50af6829fda6a44eb4d82d1860bbb07fe 100644 (file)
--- 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: 1834093:1834234 (outdated) -->
+<!-- English Revision: 1834093:1834244 (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 ff6875f44e469ae199115440f5656700f548d289..6b4d9346c3828bae14b78ea81ef45934b6cd362a 100644 (file)
--- 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:1834234 (outdated) -->
+<!-- English Revision: 344971:1834244 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more