From c43fc805def935277e143758325dde4a063c7a69 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jim@apache.org>
Date: Thu, 13 Sep 2012 17:16:48 +0000
Subject: [PATCH] xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1384412 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/howto/auth.xml.meta            |  2 +-
 docs/manual/misc/perf-tuning.xml.meta      |  2 +-
 docs/manual/mod/mod_auth_digest.xml.meta   |  2 +-
 docs/manual/mod/mod_proxy.html.en          | 16 ++++++-------
 docs/manual/mod/mod_proxy.xml.fr           |  2 +-
 docs/manual/mod/mod_proxy.xml.ja           |  2 +-
 docs/manual/mod/mod_proxy.xml.meta         |  2 +-
 docs/manual/mod/mod_proxy_balancer.html.en | 28 +++++++++++-----------
 docs/manual/mod/mod_proxy_balancer.xml.ja  |  2 +-
 docs/manual/mod/mod_rewrite.xml.meta       |  2 +-
 docs/manual/rewrite/flags.xml.meta         |  2 +-
 docs/manual/ssl/ssl_howto.xml.meta         |  2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/manual/howto/auth.xml.meta b/docs/manual/howto/auth.xml.meta
index 641334dcd6..b0b2e95d63 100644
--- a/docs/manual/howto/auth.xml.meta
+++ b/docs/manual/howto/auth.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/misc/perf-tuning.xml.meta b/docs/manual/misc/perf-tuning.xml.meta
index ebbf5c2492..a4ba1984eb 100644
--- a/docs/manual/misc/perf-tuning.xml.meta
+++ b/docs/manual/misc/perf-tuning.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
   </variants>
diff --git a/docs/manual/mod/mod_auth_digest.xml.meta b/docs/manual/mod/mod_auth_digest.xml.meta
index 5e68b12cb2..7583c0e005 100644
--- a/docs/manual/mod/mod_auth_digest.xml.meta
+++ b/docs/manual/mod/mod_auth_digest.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 36db341dc7..38b569374e 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1277,10 +1277,10 @@ ProxyPass /mirror/foo http://backend.example.com
 ProxyPass /special-area http://special.example.com smax=5 max=10
 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
 &lt;Proxy balancer://mycluster&gt;
-    BalancerMember ajp://1.2.3.4:8009
-    BalancerMember ajp://1.2.3.5:8009 loadfactor=20
+    BalancerMember ajp://1.2.3.4:8009/
+    BalancerMember ajp://1.2.3.5:8009/ loadfactor=20
     # Less powerful server, don't send as many requests there,
-    BalancerMember ajp://1.2.3.6:8009 loadfactor=5
+    BalancerMember ajp://1.2.3.6:8009/ loadfactor=5
 &lt;/Proxy&gt;
     </pre>
 
@@ -1290,10 +1290,10 @@ ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover
     <pre class="prettyprint lang-config">
 ProxyPass / balancer://hotcluster/ 
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember ajp://1.2.3.4:8009 loadfactor=1
-    BalancerMember ajp://1.2.3.5:8009 loadfactor=2
+    BalancerMember ajp://1.2.3.4:8009/ loadfactor=1
+    BalancerMember ajp://1.2.3.5:8009/ loadfactor=2
     # The server below is on hot standby
-    BalancerMember ajp://1.2.3.6:8009 status=+H
+    BalancerMember ajp://1.2.3.6:8009/ status=+H
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
     </pre>
@@ -1709,8 +1709,8 @@ expressions</td></tr>
 
     <div class="example"><pre class="prettyprint lang-config">
 &lt;Proxy balancer://hotcluster&gt;
-    BalancerMember http://www2.example.com:8080 loadfactor=1
-    BalancerMember http://www3.example.com:8080 loadfactor=2
+    BalancerMember http://www2.example.com:8080/ loadfactor=1
+    BalancerMember http://www3.example.com:8080/ loadfactor=2
     ProxySet lbmethod=bytraffic
 &lt;/Proxy&gt;
       </pre>
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 12a8ad4431..d5cc849570 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: 1367958 -->
+<!-- English Revision: 1367958:1384410 (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 f06bd1eb92..3762b15dd4 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:1367958 (outdated) -->
+<!-- English Revision: 344971:1384410 (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 38a79fdda7..f0185375d4 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>
diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 31722f743f..bca7f79d2b 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -110,12 +110,12 @@
     </p>
 
     <pre class="prettyprint lang-config">
-&lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80
-    BalancerMember http://192.168.1.51:80
+&lt;Proxy balancer://mycluster/&gt;
+    BalancerMember http://192.168.1.50:80/
+    BalancerMember http://192.168.1.51:80/
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
+ProxyPass /test balancer://mycluster/
+ProxyPassReverse /test balancer://mycluster/
     </pre>
 
 
@@ -126,13 +126,13 @@ ProxyPassReverse /test balancer://mycluster
 
     <pre class="prettyprint lang-config">
 Header add Set-Cookie "ROUTEID=.%{BALANCER_WORKER_ROUTE}e; path=/" env=BALANCER_ROUTE_CHANGED
-&lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80 route=1
-    BalancerMember http://192.168.1.51:80 route=2
+&lt;Proxy balancer://mycluster/&gt;
+    BalancerMember http://192.168.1.50:80/ route=1
+    BalancerMember http://192.168.1.51:80/ route=2
     ProxySet stickysession=ROUTEID
 &lt;/Proxy&gt;
-ProxyPass /test balancer://mycluster
-ProxyPassReverse /test balancer://mycluster
+ProxyPass /test balancer://mycluster/
+ProxyPassReverse /test balancer://mycluster/
     </pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -160,7 +160,7 @@ ProxyPassReverse /test balancer://mycluster
     <dt><var><a name="balancer_name" id="balancer_name">BALANCER_NAME</a></var></dt>
     <dd>
     <p>This is assigned the name of the balancer used for the current
-    request. The value is something like <code>balancer://foo</code>.</p>
+    request. The value is something like <code>balancer://foo/</code>.</p>
     </dd>
 
     
@@ -270,10 +270,10 @@ ProxyPassReverse /test balancer://mycluster
     configuring the name of the cookie and the name of the URL parameter
     separated by a vertical bar (<code>|</code>) as in the following example:</p>
     <pre class="prettyprint lang-config">
-ProxyPass /test balancer://mycluster stickysession=JSESSIONID|jsessionid scolonpathdelim=On
+ProxyPass /test balancer://mycluster/ stickysession=JSESSIONID|jsessionid scolonpathdelim=On
 &lt;Proxy balancer://mycluster&gt;
-    BalancerMember http://192.168.1.50:80 route=node1
-    BalancerMember http://192.168.1.51:80 route=node2
+    BalancerMember http://192.168.1.50:80/ route=node1
+    BalancerMember http://192.168.1.51:80/ route=node2
 &lt;/Proxy&gt;
     </pre>
 
diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index 5e818b5ad8..f4383fe52c 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:1336502 (outdated) -->
+<!-- English Revision: 395228:1384410 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta
index 0be21e86f4..decc0a7b1e 100644
--- a/docs/manual/mod/mod_rewrite.xml.meta
+++ b/docs/manual/mod/mod_rewrite.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index e4f3ee6f49..912229af03 100644
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/ssl/ssl_howto.xml.meta b/docs/manual/ssl/ssl_howto.xml.meta
index 8d9a5237f4..b7c021fd9a 100644
--- a/docs/manual/ssl/ssl_howto.xml.meta
+++ b/docs/manual/ssl/ssl_howto.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
-- 
2.40.0