From 9e35fb04e387323014ec783ac46a7c4d8e71bfe9 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jim@apache.org>
Date: Mon, 23 Jan 2012 16:51:31 +0000
Subject: [PATCH] Update xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234895 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.xml.de                | 2 +-
 docs/manual/mod/core.xml.es                | 2 +-
 docs/manual/mod/core.xml.fr                | 2 +-
 docs/manual/mod/core.xml.ja                | 2 +-
 docs/manual/mod/core.xml.tr                | 2 +-
 docs/manual/mod/mod_proxy.html.en          | 8 +++++---
 docs/manual/mod/mod_proxy.xml.fr           | 2 +-
 docs/manual/mod/mod_proxy.xml.ja           | 2 +-
 docs/manual/mod/mod_proxy_balancer.html.en | 4 +++-
 docs/manual/mod/mod_proxy_balancer.xml.ja  | 2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 5488fe5644..df1a21536a 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1234646 (outdated) -->
+<!-- English Revision: 344972:1234878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 44e3c8190e..6a0b1e9dcb 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1234646 (outdated) -->
+<!-- English Revision: 1040494:1234878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index d067763bba..6053d0e6ba 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.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: 1188095:1234646 (outdated) -->
+<!-- English Revision: 1188095:1234878 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index c6be0b90c4..2fedc4355d 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1234646 (outdated) -->
+<!-- English Revision: 669847:1234878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index fc34f3b873..fff92aedaf 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:1234646 (outdated) -->
+<!-- English Revision: 813376:1234878 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index def3413077..3487545132 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -478,7 +478,7 @@
 </table>
     <p>This directive allows for growth potential in the number of
     Balancers available for a virtualhost in addition to the
-    number pre-configured. It only take effect if there is at
+    number pre-configured. It only takes effect if there is at
     least 1 pre-configured Balancer.</p>
 
 </div>
@@ -920,8 +920,10 @@ through</td></tr>
     <code>http://example.com/mirror/foo/bar</code> to be internally converted
     into a proxy request to <code>http://backend.example.com/bar</code>.</p>
 
-    <p>The following alternative syntax is possible, however carries a
-    performance penalty when present in large numbers:</p>
+    <p>The following alternative syntax is possible, however it can carry a
+    performance penalty when present in very large numbers. The advantage of
+    the below syntax is that it allows for dynamic control via the
+    <a href="mod_proxy_balancer.html#balancer_manager">Balancer Manager</a> interface:</p>
 
     <div class="example"><p><code>
         ProxyPass /mirror/foo/ http://backend.example.com/
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 1231a2bfe8..3d320c559e 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: 1179272:1212600 (outdated) -->
+<!-- English Revision: 1179272:1234890 (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 c40ffbbc21..3fd75c21b2 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:1212600 (outdated) -->
+<!-- English Revision: 344971:1234890 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 62f1a91c02..71dc6ff333 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -213,7 +213,9 @@
 
     <p>You can now access load balancer manager by using a Web browser
     to access the page
-    <code>http://your.server.name/balancer-manager</code></p>
+    <code>http://your.server.name/balancer-manager</code>. Please note
+    that only Balancers defined outside of <code>&lt;Location ...&gt;</code>
+    containers can be dynamically controlled by the Manager.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="stickyness_implementation" id="stickyness_implementation">Details on load balancer stickyness</a></h2>
diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index ec055c60ad..b58a589d1b 100644
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.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: 395228:1226940 (outdated) -->
+<!-- English Revision: 395228:1234890 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
-- 
2.40.0