Merge r1031327 from trunk:

PR#49460: balancer example sets a large loadfactor on the "weak" server.

Set loadfactors on both servers, also remove smax= from the example.

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index bc5dc4f3cb356fbcd5ae023e046c5e7bc5d870f8..22d4755414ef69073c31b9906d97478ff8e3582b 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1149,9 +1149,9 @@ through</td></tr>
       &lt;Proxy balancer://mycluster&gt;<br />
       <span class="indent">
         BalancerMember ajp://1.2.3.4:8009<br />
-        BalancerMember ajp://1.2.3.5:8009 smax=10<br />
-        # Less powerful server, don't send as many requests there<br />
-        BalancerMember ajp://1.2.3.6:8009 smax=1 loadfactor=20<br />
+        BalancerMember ajp://1.2.3.5:8009 loadfactor=20<br />
+        # Less powerful server, don't send as many requests there,<br />
+        BalancerMember ajp://1.2.3.6:8009 loadfactor=5<br />
       </span>
       &lt;/Proxy&gt;
     </code></p></div>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 7b5d37f104d6638c5ee1df9ba7bb27bf1015c1b2..50e0f9dbbebb3a7426f8c35615589a89093b30ed 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -997,9 +997,9 @@ expressions</description>
       &lt;Proxy balancer://mycluster&gt;<br />
       <indent>
         BalancerMember ajp://1.2.3.4:8009<br />
-        BalancerMember ajp://1.2.3.5:8009 smax=10<br />
-        # Less powerful server, don't send as many requests there<br />
-        BalancerMember ajp://1.2.3.6:8009 smax=1 loadfactor=20<br />
+        BalancerMember ajp://1.2.3.5:8009 loadfactor=20<br />
+        # Less powerful server, don't send as many requests there,<br />
+        BalancerMember ajp://1.2.3.6:8009 loadfactor=5<br />
       </indent>
       &lt;/Proxy&gt;
     </example>