From: Eric Covener <covener@apache.org>
Date: Wed, 10 Nov 2010 17:24:37 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.18~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d48129bfc3f984270dc64aa8223dbe59ff36197;p=thirdparty%2Fapache%2Fhttpd.git

xforms


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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 83bed93f6c6..9eea1b056bf 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1100,8 +1100,9 @@ through</td></tr>
         <td>Balancer load-balance method. Select the load-balancing scheduler
         method to use. Either <code>byrequests</code>, to perform weighted
         request counting, <code>bytraffic</code>, to perform weighted
-        traffic byte count balancing, or <code>bybusyness</code>, to perform 
-        pending request balancing. Default is <code>byrequests</code>.
+        traffic byte count balancing, or <code>bybusyness</code> 
+        (Apache HTTP Server 2.2.10 and later), to perform pending request 
+        balancing. Default is <code>byrequests</code>.
     </td></tr>
     <tr><td>maxattempts</td>
         <td>One less than the number of workers, or 1 with a single worker.</td>
diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 667b74da855..a58d40bd936 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -346,6 +346,8 @@ candidate lbstatus -= total factor</code></pre></div>
     tie. Over time, the distribution of work will come to resemble that
     characteristic of <code>byrequests</code>.</p>
 
+    <p>This algorithm is available in Apache HTTP Server 2.2.10 and later.</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>