svn commit: r684343 - /httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml

[rp...@apache.org]

Author: rpluem
Date: Sat Aug  9 13:59:42 2008
New Revision: 684343

URL: http://svn.apache.org/viewvc?rev=684343&view=rev
Log:
Merge r684337, r684338 from trunk:

* Fix bogus explanation of timeout parameter

* Improve timeout documentation even more

Submitted by: rpluem
Reviewed by: rpluem

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml?rev=684343&r1=684342&r2=684343&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml Sat Aug  9 13:59:42 2008
@@ -782,12 +782,9 @@
         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>