Merge r684337, r684338 from trunk:

* Fix bogus explanation of timeout parameter

* Improve timeout documentation even more

Submitted by: rpluem
Reviewed by: rpluem

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 9ce554a93697b3384161eb302d8d4d53d30e5b0b..67c310a68eb7af4934d74af5600c01c92a9d9a2b 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -782,12 +782,9 @@ expressions</description>
         clears the in-error flag.
     </td></tr>
     <tr><td>timeout</td>
-        <td><directive>Timeout</directive></td>
+        <td><directive>ProxyTimeout</directive></td>
         <td>Connection timeout in seconds.
-        If not set the Apache will wait until the free connection
-        is available. This directive is used for limiting the number
-        of connections to the backend server together with <code>max</code>
-        parameter.
+        The number of seconds Apache waits for data sent by / to the backend.
     </td></tr>
     <tr><td>ttl</td>
         <td>-</td>