Document the lbmethod naming is now bytraffic|byrequests not simply

traffic|requests

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 189e7406ea1b5f10e1c470077298343d45d2a064..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>

diff --git a/docs/manual/mod/mod_proxy.html.ja.euc-jp b/docs/manual/mod/mod_proxy.html.ja.euc-jp
index 36c6a19690457e6ef128e711cc68bdada0959d8b..8341e41611e3d5a3804be7b15c872dc0b4791e4b 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy.html.ja.euc-jp
@@ -881,9 +881,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>
@@ -1199,4 +1199,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 314304f7795fd624d1023f3e63a4450bcde84c2c..8bb5f1714390ec2a8cfddc3578eaf252c0e86427 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..97006498b6f4dfd25aeccc759eaab2e44a64e940 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -51,8 +51,8 @@
 <h3>Topics</h3>
 <ul id="topics">
 <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="#byrequests">Request Counting Algorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#bytraffic">Weighted Traffic Counting Algorithm</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">
@@ -70,9 +70,9 @@
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="requests" id="requests">Request Counting Algorithm</a></h2>
+<h2><a name="byrequests" id="byrequests">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>
@@ -242,9 +242,9 @@ candidate lbstatus -= total factor</code></pre></div>
     are selected with 3 <var>b</var> interspersed.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="traffic" id="traffic">Weighted Traffic Counting Algorithm</a></h2>
+<h2><a name="bytraffic" id="bytraffic">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..a3f5f08109a04dbe9856d07806e3f64d3a2999e2 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
@@ -50,8 +50,8 @@
 <h3>¥È¥Ô¥Ã¥¯</h3>
 <ul id="topics">
 <li><img alt="" src="../images/down.gif" /> <a href="#scheduler">¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥¹¥±¥¸¥å¡¼¥é¤Î¥¢¥ë¥´¥ê¥º¥à</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#requests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#traffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#byrequests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#bytraffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#enable">¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
 </ul><h3>»²¾È</h3>
 <ul class="seealso">
@@ -70,9 +70,9 @@
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="requests" id="requests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
+<h2><a name="byrequests" id="byrequests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
     
-    <p><code>lbmethod=requests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+    <p><code>lbmethod=byrequests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
     ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢ÍÍ¡¹¤Ê¥ï¡¼¥«¡¼¤¬¤½¤ì¤¾¤ì¡¢
     ÀßÄꤵ¤ì¤Æ¤¤¤ëʬô¥ê¥¯¥¨¥¹¥È¿ô¤ò¤­¤Á¤ó¤È¼õ¤±¼è¤ì¤ë¤è¤¦¤Ë¡¢
     ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È¤¤¤¦¹Í¤¨Êý¤Ç¤¹¡£¼¡¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
@@ -244,9 +244,9 @@ candidate lbstatus -= total factor</code></pre></div>
     <var>b</var> 3 ²ó¤Ç¤Þ¤Ð¤é¤ËÁª¤Ð¤ì¤Þ¤¹¡£</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="traffic" id="traffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
+<h2><a name="bytraffic" id="bytraffic">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..7c0dc6b3daf6d007c0dc1b1b139c297233b6c381 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml
+++ b/docs/manual/mod/mod_proxy_balancer.xml
@@ -58,9 +58,9 @@
 
 </section>
 
-<section id="requests">
+<section id="byrequests">
     <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>
@@ -237,9 +237,9 @@ candidate lbstatus -= total factor</code></pre>
     are selected with 3 <var>b</var> interspersed.</p>
 </section>
 
-<section id="traffic">
+<section id="bytraffic">
     <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..3c374636bada9681a66977c76628869a889782bc 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.xml.ja
@@ -58,9 +58,9 @@
 
 </section>
 
-<section id="requests">
+<section id="byrequests">
     <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>
@@ -239,9 +239,9 @@ candidate lbstatus -= total factor</code></pre>
     <var>b</var> 3 \e$B2s$G$^$P$i$KA*$P$l$^$9!#\e(B</p>
 </section>
 
-<section id="traffic">
+<section id="bytraffic">
     <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>