Merge r657760 from trunk:

Note "acquire" is in milliseconds.
PR: 45033

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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 4ef73526edb3fe712fbd43c28324d8ff187c7aa1..5e9d6056f5777a7a4775d82ddcc76ed57640eb5b 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -820,9 +820,9 @@ through</td></tr>
     <tr><td>acquire</td>
         <td>-</td>
         <td>If set this will be the maximum time to wait for a free
-    connection in the connection pool. If there are no free connections
-    in the pool the Apache will return <code>SERVER_BUSY</code> status to
-    the client.
+    connection in the connection pool, in milliseconds. If there are no free
+    connections in the pool the Apache will return <code>SERVER_BUSY</code>
+    status to the client.
     </td></tr>
     <tr><td>disablereuse</td>
         <td>Off</td>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 39f40fd69fee09998b4e6b8cf77a4df6a085b646..46047f4dcf0554a6756fed094bfa409c93ef1618 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -659,9 +659,9 @@ expressions</description>
     <tr><td>acquire</td>
         <td>-</td>
         <td>If set this will be the maximum time to wait for a free
-    connection in the connection pool. If there are no free connections
-    in the pool the Apache will return <code>SERVER_BUSY</code> status to
-    the client.
+    connection in the connection pool, in milliseconds. If there are no free
+    connections in the pool the Apache will return <code>SERVER_BUSY</code>
+    status to the client.
     </td></tr>
     <tr><td>disablereuse</td>
         <td>Off</td>