From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 9 Aug 2008 20:32:05 +0000 (+0000)
Subject: * Fix bogus explanation of timeout parameter
X-Git-Tag: 2.3.0~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043dfd4d8b860b0bb04df5adbcf46cbfc70840c8;p=thirdparty%2Fapache%2Fhttpd.git

* Fix bogus explanation of timeout parameter


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@684337 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 45153ea1761..35ef7504ffd 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -786,10 +786,9 @@ expressions</description>
     <tr><td>timeout</td>
         <td><directive>Timeout</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.
+        If not set, it defaults to
+        <directive module="mod_proxy">ProxyTimeout</directive>.
     </td></tr>
     <tr><td>ttl</td>
         <td>-</td>