From: André Malo <nd@apache.org>
Date: Sun, 19 Nov 2006 14:38:11 +0000 (+0000)
Subject: update transformation
X-Git-Tag: 2.2.4~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c84438cdfcda658eeed06854fe52f761e2f95e4;p=thirdparty%2Fapache%2Fhttpd.git

update transformation


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

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 491abd15154..f5f066834d9 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -293,8 +293,8 @@ person in</a></h2>
     <div class="example"><p><code>
       AuthType Basic<br />
       AuthName "By Invitation Only"<br />
-      # Optional line:
-      AuthBasicProvider file
+      # Optional line:<br />
+      AuthBasicProvider file<br />
       AuthUserFile /usr/local/apache/passwd/passwords<br />
       AuthGroupFile /usr/local/apache/passwd/groups<br />
       Require group GroupName
diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index b6ce1dc6cd0..1a2b9e1fb53 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 219484:421100 (outdated) -->
+<!-- English Revision: 219484:453081 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index eaa4bf61765..ed5dfbf8215 100644
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:421100 (outdated) -->
+<!-- English Revision: 105989:453081 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 3f832a6fa5f..99d6e75c6c3 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3094,7 +3094,7 @@ server</td></tr>
 certain events before failing a request</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TimeOut 300</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
 </table>
@@ -3287,7 +3287,7 @@ hostname or IP address</td></tr>
       <li>The IP address of the virtual host;</li>
 
       <li>A fully qualified domain name for the IP address of the
-      virtual host;</li>
+      virtual host (not recommended);</li>
 
       <li>The character <code>*</code>, which is used only in combination with
       <code>NameVirtualHost *</code> to match all IP addresses; or</li>
diff --git a/docs/manual/mod/core.html.ja.euc-jp b/docs/manual/mod/core.html.ja.euc-jp
index 6449648402c..8bb254206d8 100644
--- a/docs/manual/mod/core.html.ja.euc-jp
+++ b/docs/manual/mod/core.html.ja.euc-jp
@@ -2778,7 +2778,7 @@ Apache 
 <div class="directive-section"><h2><a name="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¤È¤­¤Ë»È¤¦¥Û¥¹¥È̾¤È¥Ý¡¼¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerName <var>fully-qualified-domain-name</var>[:<var>port</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
 <tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
@@ -2786,7 +2786,7 @@ Apache 
     <code class="directive">Port</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Îµ¡Ç½¤â´Þ¤ß¤Þ¤¹¡£</td></tr>
 </table>
     <p><code class="directive">ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤òÀßÄꤷ¤Þ¤¹¡£
+    ¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¥ê¥¯¥¨¥¹¥È¥¹¥­¡¼¥à¤È¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤òÀßÄꤷ¤Þ¤¹¡£
     ¤³¤ì¤Ï¡¢¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë URL ¤òÀ¸À®¤¹¤ëºÝ¤ËÍøÍѤµ¤ì¤Þ¤¹¡£
     Î㤨¤Ð¡¢¥¦¥§¥Ö¥µ¡¼¥Ð¤òÆ°¤«¤·¤Æ¤¤¤ë¥Þ¥·¥ó¤Ï <code>simple.example.com</code>
     ¤Ç¡¢DNS ¤Î¥¨¥¤¥ê¥¢¥¹ <code>www.example.com</code> ¤â¤¢¤ë¤È¤­¤Ë¡¢
@@ -2810,6 +2810,13 @@ Apache 
     <code class="directive">ServerName</code> ¤Ï¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Þ¥Ã¥Á¤¹¤ë¤¿¤á¤Ë
     ²¿¤¬¥ê¥¯¥¨¥¹¥È¤Î Host: ¥Ø¥Ã¥À¤Ë¸½¤ì¤ëɬÍפ¬¤¢¤ë¤Î¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
 
+    <p>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ä¥í¡¼¥É¥Ð¥é¥ó¥µ¤äSSLÉé²Ù·Ú¸ºÁõÃ֤Τ褦¤Ê¡¢
+    SSL¤ò½èÍý¤¹¤ë¥Þ¥·¥ó¤Î¸å¤í¤Ç¥µ¡¼¥Ð¤òÆ°¤«¤¹¾ì¹ç¤Ï¡¢
+    ¥µ¡¼¥Ð¤¬Àµ¤·¤¤¼«¸Ê»²¾È URL¤ò³Î¼Â¤ËÀ¸À®¤¹¤ë¤è¤¦¤Ë¡¢
+    <code>https://</code> ¥¹¥­¡¼¥à¤È¥¯¥é¥¤¥¢¥ó¥È¤¬Àܳ¤¹¤ë¥Ý¡¼¥ÈÈÖ¹æ¤ò¡¢
+    <code class="directive">ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+    </p>
+
     <p>¼«¸Ê»²¾È URL (Î㤨¤Ð <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> ¥â¥¸¥å¡¼¥ë¤Ë¤è¤ë¤â¤Î¤Ê¤É)
     ¤¬»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¤ò»È¤¦¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»È¤¦¤«¤ò
     ·èÄꤹ¤ëÀßÄê¤Ï <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> 
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index c0affcccda0..ac35f1390bc 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: 167959:425051 (outdated) -->
+<!-- English Revision: 167959:475699 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 4a5deed0e7d..2b094cfc71b 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 425051 -->
+<!-- English Revision: 425051:475699 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_authn_alias.html.en b/docs/manual/mod/mod_authn_alias.html.en
index 563223be50c..91d31e8dd84 100644
--- a/docs/manual/mod/mod_authn_alias.html.en
+++ b/docs/manual/mod/mod_authn_alias.html.en
@@ -86,7 +86,7 @@
          AuthType Basic<br />
          AuthName LDAP_Protected_Place<br />
          AuthzLDAPAuthoritative off<br />
-         require valid-user<br />
+         Require valid-user<br />
       </span>
       &lt;/Directory&gt;<br />
     </code></p></div>
@@ -99,7 +99,7 @@ extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
 ... &lt;/AuthnProviderAlias&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authn_alias</td></tr>
 </table>
diff --git a/docs/manual/mod/mod_cgid.html.ja.euc-jp b/docs/manual/mod/mod_cgid.html.ja.euc-jp
index fc0a40d688a..4c2356bcd00 100644
--- a/docs/manual/mod/mod_cgid.html.ja.euc-jp
+++ b/docs/manual/mod/mod_cgid.html.ja.euc-jp
@@ -25,8 +25,6 @@
 <a href="../ja/mod/mod_cgid.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>³°Éô CGI ¥Ç¡¼¥â¥ó¤ò»È¤Ã¤¿ CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô</td></tr>
 <tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>cgid_module</td></tr>
@@ -70,15 +68,16 @@
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î̾Á°</td></tr>
+<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptSock <var>file-path</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScriptSock logs/cgisock</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
+<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
 <tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cgid</td></tr>
 </table>
     <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î
-    ̾Á°¤òÀßÄꤷ¤Þ¤¹¡£¥½¥±¥Ã¥È¤Ï Apache ¤¬µ¯Æ°¤µ¤ì¤¿¥æ¡¼¥¶ (Ä̾ï root) ¤Î
+    ¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­¤òÀßÄꤷ¤Þ¤¹¡£¤Þ¤¿¡¢¥Õ¥¡¥¤¥ë̾¤Ë¤Ï¥µ¡¼¥Ð¤Î¥×¥í¥»¥¹ID¤¬
+    Äɲ䵤ì¤Þ¤¹¡£¥½¥±¥Ã¥È¤Ï Apache ¤¬µ¯Æ°¤µ¤ì¤¿¥æ¡¼¥¶ (Ä̾ï root) ¤Î
     ¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÍѤ¤¤Æ¥ª¡¼¥×¥ó¤µ¤ì¤Þ¤¹¡£CGI ¥¹¥¯¥ê¥×¥È¤È¤ÎÄÌ¿®¤Î
     ¥»¥­¥å¥ê¥Æ¥£¤òÊݤĤ¿¤á¤Ë¡¢¥½¥±¥Ã¥È¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë
     ¾¤Î¥æ¡¼¥¶¤¬½ñ¤­¹þ¤ß¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬½ÅÍפǤ¹¡£</p>
diff --git a/docs/manual/mod/mod_cgid.xml.meta b/docs/manual/mod/mod_cgid.xml.meta
index 24cf1e53d83..6fbca83827d 100644
--- a/docs/manual/mod/mod_cgid.xml.meta
+++ b/docs/manual/mod/mod_cgid.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</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 b9777e41a8f..2caee4994b7 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -763,6 +763,12 @@ through</td></tr>
     generally 120ms), and thus prevent the firewall to drop the connection.
     To enable keepalive set this property value to <code>On</code>. 
     </td></tr>
+    <tr><td>lbset</td>
+        <td>0</td>
+        <td>Sets the load balancer cluster set that the worker is a member
+         of. The load balancer will try all members of a lower numbered
+         lbset before trying higher numbered ones.
+    </td></tr>
     <tr><td>loadfactor</td>
         <td>1</td>
         <td>Worker load factor. Used with BalancerMember.
@@ -793,7 +799,7 @@ through</td></tr>
     <tr><td>status</td>
         <td>-</td>
         <td>Single letter value defining the initial status of
-        this worker: 'D' is disabled, 'S' is stopped
+        this worker: 'D' is disabled, 'S' is stopped, 'H' is hot-standby
         and 'E' is in an error state. Status can be set (which is the default)
         by prepending with '+' or cleared by prepending with '-'.
         Thus, a setting of 'S-E' sets this worker to Stopped and
@@ -870,6 +876,22 @@ through</td></tr>
       </span>
       &lt;/Proxy&gt;
     </code></p></div>
+
+    <p>Setting up a hot-standby, that will only be used if no other
+     members are available</p>
+    <div class="example"><p><code>
+      ProxyPass / balancer://hotcluster/ <br />
+      &lt;Proxy balancer://hotcluster&gt;<br />
+      <span class="indent">
+        BalancerMember http://1.2.3.4:8009 loadfactor=1<br />
+        BalancerMember http://1.2.3.5:8009 loadfactor=2<br />
+        # The below is the hot standby<br />
+        BalancerMember http://1.2.3.6:8009 status=+H<br />
+        ProxySet lbmethod=bytraffic
+      </span>
+      &lt;/Proxy&gt;
+    </code></p></div>
+
     
     <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
     directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 60afd85192c..b7b53964350 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="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 189754:432350 (outdated) -->
+<!-- English Revision: 189754:440800 (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 a857b429ceb..98ce620f124 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -53,6 +53,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#scheduler">Load balancer scheduler algorithm</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#requests">Request Counting Algorithm</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#traffic">Weighted Traffic Counting Algorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#environment">Exported Environment Variables</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#enable">Enabling Balancer Manager Support</a></li>
 </ul><h3>See also</h3>
 <ul class="seealso">
@@ -273,6 +274,59 @@ candidate lbstatus -= total factor</code></pre></div>
     size of the request and response are applied to the weighting
     and selection algorithm.</p>
 
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="environment" id="environment">Exported Environment Variables</a></h2>
+    
+    <p>At present there are 6 environment variables exported:</p>
+
+    <dl>
+    
+    <dt><var><a name="balancer_session_sticky" id="balancer_session_sticky">BALANCER_SESSION_STICKY</a></var></dt>
+    <dd>
+    <p>This is assigned the <var>stickysession</var> value used in the current
+    request.  It is the cookie or parameter name used for sticky sessions</p>
+    </dd>
+
+    
+    <dt><var><a name="balancer_session_route" id="balancer_session_route">BALANCER_SESSION_ROUTE</a></var></dt>
+    <dd>
+    <p>This is assigned the <var>route</var> parsed from the current 
+    request.</p>
+    </dd>
+
+    
+    <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>
+    </dd>
+
+    
+    <dt><var><a name="balancer_worker_name" id="balancer_worker_name">BALANCER_WORKER_NAME</a></var></dt>
+    <dd>
+    <p>This is assigned the name of the worker used for the current request.
+    The value is something like <code>http://hostA:1234</code>.</p>
+    </dd>
+
+    
+    <dt><var><a name="balancer_worker_route" id="balancer_worker_route">BALANCER_WORKER_ROUTE</a></var></dt>
+    <dd>
+    <p>This is assigned the <var>route</var> of the worker that will be 
+    used for the current request.</p>
+    </dd>
+
+    
+    <dt><var><a name="balancer_route_changed" id="balancer_route_changed">BALANCER_ROUTE_CHANGED</a></var></dt>
+    <dd>
+    <p>This is set to 1 if the session route does not match the
+    worker route (BALANCER_SESSION_ROUTE != BALANCER_WORKER_ROUTE) or the
+    session does not yet have an established route.  This can be used to
+    determine when/if the client needs to be sent an updated route
+    when sticky sessions are used.</p>
+    </dd>
+    </dl>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="enable" id="enable">Enabling Balancer Manager Support</a></h2>
diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index 543b5e6302f..9a2e2804962 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="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 153116:421100 (outdated) -->
+<!-- English Revision: 153116:472114 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 6440e174edc..09822302508 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -182,7 +182,7 @@ environment variable</td></tr>
 <tr><td><a href="core.html#authname">AuthName <var>auth-Bereich</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Autorisierungsbereich zur Verwendung in der
 HTTP-Authentisierung</td></tr>
 <tr class="odd"><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Art der Authentisierung</td></tr>
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index f620be25969..bd770516acb 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -179,7 +179,7 @@ environment variable</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
 authentication</td></tr>
 <tr><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
@@ -710,7 +710,7 @@ per child process</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
 <tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
 <tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index 33c035528da..84a2abd7b27 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -182,7 +182,7 @@ environment variable</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
 authentication</td></tr>
 <tr><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
@@ -713,7 +713,7 @@ per child process</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
 <tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
 <tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ja.euc-jp b/docs/manual/mod/quickreference.html.ja.euc-jp
index 264d03039bf..26ebf817384 100644
--- a/docs/manual/mod/quickreference.html.ja.euc-jp
+++ b/docs/manual/mod/quickreference.html.ja.euc-jp
@@ -174,7 +174,7 @@ environment variable</td></tr>
 <tr><td><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP ǧ¾Ú¤Îǧ²ÄÎΰè (ÌõÃí: realm)</td></tr>
 <tr><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥æ¡¼¥¶Ç§¾Ú¤Î¼ïÎà</td></tr>
@@ -546,7 +546,7 @@ CGI 
 <tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Î¾ì½ê</td></tr>
 <tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <em>bytes</em></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">¥¹¥¯¥ê¥×¥È¥í¥°¤Ëµ­Ï¿¤µ¤ì¤ë PUT ¤ä POST ¥ê¥¯¥¨¥¹¥È¤ÎÆâÍƤξå¸Â</td></tr>
 <tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â</td></tr>
-<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î̾Á°</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­</td></tr>
 <tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
 <var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
 <tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP ¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
@@ -555,7 +555,7 @@ CGI 
 <tr><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤ò̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Þ¥Ã¥Á¤µ¤»¤Æ¤¤¤ë¤È¤­¤Ë
 »ÈÍѤµ¤ì¤ë¥Û¥¹¥È¤ÎÊÌ̾</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">ÀßÄê²Äǽ¤Ê¥µ¡¼¥Ð¥×¥í¥»¥¹¿ô¤Î¾å¸Â</td></tr>
-<tr><td><a href="core.html#servername">ServerName <var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¤È¤­¤Ë»È¤¦¥Û¥¹¥È̾¤È¥Ý¡¼¥È</td></tr>
+<tr><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¤È¤­¤Ë»È¤¦¥Û¥¹¥È̾¤È¥Ý¡¼¥È</td></tr>
 <tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Èó¸ß´¹¤Î¥Ö¥é¥¦¥¶¤¬Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤Î
 ¤¿¤á¤Î¸ß´¹ÍÑ URL ¥Ñ¥¹Ì¾</td></tr>
 <tr><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥µ¡¼¥Ð¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index e5c9261e803..3a1df5ef284 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -167,7 +167,7 @@ environment variable</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
 authentication</td></tr>
 <tr><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
@@ -655,7 +655,7 @@ per child process</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
 <tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
 <tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ru.koi8-r b/docs/manual/mod/quickreference.html.ru.koi8-r
index 6354ce741fd..06868f4a773 100644
--- a/docs/manual/mod/quickreference.html.ru.koi8-r
+++ b/docs/manual/mod/quickreference.html.ru.koi8-r
@@ -181,7 +181,7 @@ environment variable</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
 authentication</td></tr>
 <tr><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
-... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
 <tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
@@ -712,7 +712,7 @@ per child process</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
 <tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
 <tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>