From: Takashi Sato <takashi@apache.org>
Date: Mon, 19 May 2008 11:55:18 +0000 (+0000)
Subject: Merge r657760 from trunk:
X-Git-Tag: 2.2.9~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d900dc351920a55000bdc4b0c1f5aff1a2f751ad;p=thirdparty%2Fapache%2Fhttpd.git

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 4ef73526edb..5e9d6056f57 100644
--- 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 39f40fd69fe..46047f4dcf0 100644
--- 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>