Merge r1910253 from trunk:

there is a separate `connectiontimeout`

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 9cd215d2b49a2d1364222c48f002c9280ae81484..beacc3a454103d512a82f56cfaa7d1276cd8c5cb 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -1219,7 +1219,7 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
     </td></tr>
     <tr><td>timeout</td>
         <td><directive module="mod_proxy">ProxyTimeout</directive></td>
-        <td>Connection timeout in seconds.
+        <td>Socket timeout in seconds.
         The number of seconds Apache httpd waits for data sent by / to the backend.
     </td></tr>
     <tr><td>ttl</td>