From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 16 Aug 2008 19:26:50 +0000 (+0000)
Subject: * Fix error in default setting for ProxyTimeout
X-Git-Tag: 2.3.0~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=609d5c93cc98eb903627f3e458519a57de3a7104;p=thirdparty%2Fapache%2Fhttpd.git

* Fix error in default setting for ProxyTimeout


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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e6b30ffa1fe..f1ec76d7134 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -790,7 +790,7 @@ expressions</description>
         clears the in-error flag.
     </td></tr>
     <tr><td>timeout</td>
-        <td><directive>ProxyTimeout</directive></td>
+        <td><directive module="mod_proxy">ProxyTimeout</directive></td>
         <td>Connection timeout in seconds.
         The number of seconds Apache waits for data sent by / to the backend.
     </td></tr>
@@ -1313,7 +1313,7 @@ directly</description>
 <name>ProxyTimeout</name>
 <description>Network timeout for proxied requests</description>
 <syntax>ProxyTimeout <var>seconds</var></syntax>
-<default>ProxyTimeout 300</default>
+<default>Value of <directive module="core">Timeout</directive></default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 <compatibility>Available in Apache 2.0.31 and later</compatibility>