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 39310916bfc5252ca544bbce254bede6eece9520..bc5dc4f3cb356fbcd5ae023e046c5e7bc5d870f8 100644 (file)
--- 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 26b4af475b4920a39d804da0af5a411597d2d1b2..7b5d37f104d6638c5ee1df9ba7bb27bf1015c1b2 100644 (file)
--- 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>