From: Eric Covener <covener@apache.org>
Date: Thu, 4 Nov 2010 22:47:20 +0000 (+0000)
Subject: Merge r1031311 from trunk:
X-Git-Tag: 2.2.18~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6017e3b0be27f3e9c576be67ae7ae9fb1efb9cb8;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1031311 from trunk:

PR#48865: maxattempts=1 in balancer doc is wrong.




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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 39310916bfc..bc5dc4f3cb3 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1104,7 +1104,7 @@ through</td></tr>
         pending request balancing. Default is <code>byrequests</code>.
     </td></tr>
     <tr><td>maxattempts</td>
-        <td>1</td>
+        <td>One less than the number of workers, or 1 with a single worker.</td>
         <td>Maximum number of failover attempts before giving up. 
     </td></tr>
     <tr><td>nofailover</td>
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 26b4af475b4..7b5d37f104d 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -952,7 +952,7 @@ expressions</description>
         pending request balancing. Default is <code>byrequests</code>.
     </td></tr>
     <tr><td>maxattempts</td>
-        <td>1</td>
+        <td>One less than the number of workers, or 1 with a single worker.</td>
         <td>Maximum number of failover attempts before giving up. 
     </td></tr>
     <tr><td>nofailover</td>