Document change in lbmethod= argument

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239684 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 7d062e3895cc8df31deef47742de24653f0e0e34..3818b7202e30f6f9248fab1b89e0c218377a9d35 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -879,9 +879,9 @@ through</td></tr>
     <tr><td>lbmethod</td>
         <td>-</td>
         <td>Balancer load-balance method. Select the load-balancing scheduler
-        method to use. Either <code>requests</code>, to perform weighted
-        request counting or <code>traffic</code>, to perform weighted
-        traffic byte count balancing. Default is <code>requests</code>.
+        method to use. Either <code>byrequests</code>, to perform weighted
+        request counting or <code>bytraffic</code>, to perform weighted
+        traffic byte count balancing. Default is <code>byrequests</code>.
     </td></tr>
     <tr><td>stickysession</td>
         <td>-</td>
@@ -1200,4 +1200,4 @@ header for proxied requests</td></tr>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_proxy.html.ja.euc-jp b/docs/manual/mod/mod_proxy.html.ja.euc-jp
index 699d1d2aba3f942367cae6d7f276439d447391b0..96d28618fdd1c5f2d7a6b84729ffdba0d2461d83 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy.html.ja.euc-jp
@@ -883,9 +883,9 @@
         <td>-</td>
         <td>Balancer ¤Î¥í¡¼¥É¥Ð¥é¥ó¥¹ÊýË¡¡£»ÈÍѤ¹¤ë¥í¡¼¥É¥Ð¥é¥ó¥¹¤Î
         ¥¹¥±¥¸¥å¡¼¥ê¥ó¥°ÊýË¡¤òÁª¤Ó¤Þ¤¹¡£½èÍý¤·¤¿¥ê¥¯¥¨¥¹¥È¤Î¿ô¤Ç½Å¤ßÉÕ¤±¤¹¤ë
-        <code>requests</code> ¤«¡¢Å¾Á÷Î̤ΥХ¤¥È¿ô¤Ç½Å¤ßÉÕ¤±¤¹¤ë
-        <code>traffic</code> ¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï
-        <code>requests</code> ¤Ç¤¹¡£
+        <code>byrequests</code> ¤«¡¢Å¾Á÷Î̤ΥХ¤¥È¿ô¤Ç½Å¤ßÉÕ¤±¤¹¤ë
+        <code>bytraffic</code> ¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï
+        <code>byrequests</code> ¤Ç¤¹¡£
     </td></tr>
     <tr><td>stickysession</td>
         <td>-</td>
@@ -1201,4 +1201,4 @@ URL 
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 4f77d0514c79031aa681c5ef6efe3531b9192bb2..29587b6d20e7d9d1a8e38c0bc68a9ce69439a71f 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -695,9 +695,9 @@ expressions</description>
     <tr><td>lbmethod</td>
         <td>-</td>
         <td>Balancer load-balance method. Select the load-balancing scheduler
-        method to use. Either <code>requests</code>, to perform weighted
-        request counting or <code>traffic</code>, to perform weighted
-        traffic byte count balancing. Default is <code>requests</code>.
+        method to use. Either <code>byrequests</code>, to perform weighted
+        request counting or <code>bytraffic</code>, to perform weighted
+        traffic byte count balancing. Default is <code>byrequests</code>.
     </td></tr>
     <tr><td>stickysession</td>
         <td>-</td>

diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 0922890e9f59237e9199e5a4419fd8f1bc526406..c3c6a860fe697588237d1aa97b5ccc27c5ee27f6 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -699,9 +699,9 @@
         <td>-</td>
         <td>Balancer \e$B$N%m!<%I%P%i%s%9J}K!!#;HMQ$9$k%m!<%I%P%i%s%9$N\e(B
         \e$B%9%1%8%e!<%j%s%0J}K!$rA*$S$^$9!#=hM}$7$?%j%/%(%9%H$N?t$G=E$_IU$1$9$k\e(B
-        <code>requests</code> \e$B$+!"E>AwNL$N%P%$%H?t$G=E$_IU$1$9$k\e(B
-        <code>traffic</code> \e$B$r@_Dj$G$-$^$9!#%G%U%)%k%H$O\e(B
-        <code>requests</code> \e$B$G$9!#\e(B
+        <code>byrequests</code> \e$B$+!"E>AwNL$N%P%$%H?t$G=E$_IU$1$9$k\e(B
+        <code>bytraffic</code> \e$B$r@_Dj$G$-$^$9!#%G%U%)%k%H$O\e(B
+        <code>byrequests</code> \e$B$G$9!#\e(B
     </td></tr>
     <tr><td>stickysession</td>
         <td>-</td>

diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 26821299ff290d106824013cf0b63e6bef640df6..2c661c72485dc96ae7e197c1a875ed0c6fe548fc 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -72,7 +72,7 @@
 <div class="section">
 <h2><a name="requests" id="requests">Request Counting Algorithm</a></h2>
     
-    <p>Enabled via <code>lbmethod=requests</code>, the idea behind this
+    <p>Enabled via <code>lbmethod=byrequests</code>, the idea behind this
     scheduler is that we distribute the requests among the
     various workers to ensure that each gets their configured share
     of the number of requests. It works as follows:</p>
@@ -244,7 +244,7 @@ candidate lbstatus -= total factor</code></pre></div>
 <div class="section">
 <h2><a name="traffic" id="traffic">Weighted Traffic Counting Algorithm</a></h2>
     
-    <p>Enabled via <code>lbmethod=traffic</code>, the idea behind this
+    <p>Enabled via <code>lbmethod=bytraffic</code>, the idea behind this
     scheduler is very similar to the Request Counting method, with
     the following changes:</p>
 
@@ -313,4 +313,4 @@ candidate lbstatus -= total factor</code></pre></div>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
index a521cac37e8ca08cb7351cd6e1ff19f2a01bdbd4..65e4bb40b0ea4730d06c748965313fa68cd9a401 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
@@ -72,7 +72,7 @@
 <div class="section">
 <h2><a name="requests" id="requests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
     
-    <p><code>lbmethod=requests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+    <p><code>lbmethod=byrequests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
     ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢ÍÍ¡¹¤Ê¥ï¡¼¥«¡¼¤¬¤½¤ì¤¾¤ì¡¢
     ÀßÄꤵ¤ì¤Æ¤¤¤ëʬô¥ê¥¯¥¨¥¹¥È¿ô¤ò¤­¤Á¤ó¤È¼õ¤±¼è¤ì¤ë¤è¤¦¤Ë¡¢
     ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È¤¤¤¦¹Í¤¨Êý¤Ç¤¹¡£¼¡¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
@@ -246,7 +246,7 @@ candidate lbstatus -= total factor</code></pre></div>
 <div class="section">
 <h2><a name="traffic" id="traffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
     
-    <p><code>lbmethod=traffic</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+    <p><code>lbmethod=bytraffic</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
     ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢Request Counting 
     ¤ÈÈó¾ï¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¼¡¤Î°ã¤¤¤¬¤¢¤ê¤Þ¤¹:</p>
 
@@ -314,4 +314,4 @@ candidate lbstatus -= total factor</code></pre></div>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml
index ee1e8c757fe86aabf95322138f6334ed8b19877e..b5a8d2cf018136c7a6ee5130dca870ae7b185ee4 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml
+++ b/docs/manual/mod/mod_proxy_balancer.xml
@@ -60,7 +60,7 @@
 
 <section id="requests">
     <title>Request Counting Algorithm</title>
-    <p>Enabled via <code>lbmethod=requests</code>, the idea behind this
+    <p>Enabled via <code>lbmethod=byrequests</code>, the idea behind this
     scheduler is that we distribute the requests among the
     various workers to ensure that each gets their configured share
     of the number of requests. It works as follows:</p>
@@ -239,7 +239,7 @@ candidate lbstatus -= total factor</code></pre>
 
 <section id="traffic">
     <title>Weighted Traffic Counting Algorithm</title>
-    <p>Enabled via <code>lbmethod=traffic</code>, the idea behind this
+    <p>Enabled via <code>lbmethod=bytraffic</code>, the idea behind this
     scheduler is very similar to the Request Counting method, with
     the following changes:</p>
 

diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index b53052872ab300dad1b2460313dae4b351325677..1366707baa1942a51f7f7f6b1c940d48fe6e39d1 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.xml.ja
@@ -60,7 +60,7 @@
 
 <section id="requests">
     <title>Request Counting \e$B%"%k%4%j%:%`\e(B</title>
-    <p><code>lbmethod=requests</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
+    <p><code>lbmethod=byrequests</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
     \e$B$3$N%9%1%8%e!<%i$NGX7J$K$"$k9M$(J}$O!"MM!9$J%o!<%+!<$,$=$l$>$l!"\e(B
     \e$B@_Dj$5$l$F$$$kJ,C4%j%/%(%9%H?t$r$-$A$s$H<u$1<h$l$k$h$&$K!"\e(B
     \e$B%j%/%(%9%H$r07$&$H$$$&9M$(J}$G$9!#<!$N$h$&$KF0:n$7$^$9\e(B:</p>
@@ -241,7 +241,7 @@ candidate lbstatus -= total factor</code></pre>
 
 <section id="traffic">
     <title>Weighted Traffic Counting \e$B%"%k%4%j%:%`\e(B</title>
-    <p><code>lbmethod=traffic</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
+    <p><code>lbmethod=bytraffic</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
     \e$B$3$N%9%1%8%e!<%i$NGX7J$K$"$k9M$(J}$O!"\e(BRequest Counting 
     \e$B$HHs>o$K;w$F$$$^$9$,!"<!$N0c$$$,$"$j$^$9\e(B:</p>