* Update transformation

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 2ab9ecbe798ee0c31fcd91005165299e14a3dc1f..bbe36687ca793e41927648fb91df2da7ec0089e2 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1234,10 +1234,14 @@ expressions</td></tr>
        and later.</td></tr>
 </table>
     <p>This directive is used as an alternate method of setting any of the
-    parameters available to Proxy balancers and members normally done via the
+    parameters available to Proxy balancers and workers normally done via the
     <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive. If used
-    within a <code>&lt;Proxy <var>balancer://</var>...&gt;</code> container
-    directive, the <var>url</var> argument is not required.</p>
+    within a <code>&lt;Proxy <var>balancer url|worker url</var>&gt;</code>
+    container directive, the <var>url</var> argument is not required. As a side
+    effect the respective balancer or worker gets created. This can be useful
+    when doing reverse proxying via a
+    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> instead of a
+    <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.</p>
 
     <div class="example"><p><code>
       &lt;Proxy balancer://hotcluster&gt;<br />
@@ -1249,10 +1253,28 @@ expressions</td></tr>
       &lt;/Proxy&gt;
     </code></p></div>
 
+    <div class="example"><p><code>
+      &lt;Proxy http://backend&gt;<br />
+      <span class="indent">
+        ProxySet keepalive=On<br />
+      </span>
+      &lt;/Proxy&gt;
+    </code></p></div>
+
     <div class="example"><p><code>
         ProxySet balancer://foo lbmethod=bytraffic timeout=15
     </code></p></div>
 
+    <div class="example"><p><code>
+        ProxySet ajp://backend:7001 timeout=15
+    </code></p></div>
+
+   <div class="warning"><h3>Warning</h3>
+      <p>Keep in mind that the same parameter key can have a different meaning
+      depending whether it is applied to a balancer or a worker as shown by the two
+      examples above regarding timeout.</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.ja b/docs/manual/mod/mod_proxy.xml.ja
index a4ecda808ffef0e83ca7722c75f2606c7f6e5812..342b065355b084636e7fc72dd6b4437fa19dd5cd 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="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 189754:571778 (outdated) -->
+<!-- English Revision: 189754:571965 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more