Commit 71b9a08a authored by Eric Covener's avatar Eric Covener
Browse files

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
parent 14bcef57

docs/manual/mod/mod_proxy.html.en

+1 −1
Changes for docs/manual/mod/mod_proxy.html.en: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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>

docs/manual/mod/mod_proxy.xml

+1 −1
Changes for docs/manual/mod/mod_proxy.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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>