merge from trunk revision 475698:

TimeOut can be set in a vhost context

Submitted by: Eric Covener
Reviewed by:  Jeff Trawick

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 7ac66e709ac2c0af36cf21cc35f77c529e9a7b54..d1bf7b7c76673cc600b6a323c271086031851dd7 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3069,7 +3069,7 @@ server</description>
 certain events before failing a request</description>
 <syntax>TimeOut <var>seconds</var></syntax>
 <default>TimeOut 300</default>
-<contextlist><context>server config</context></contextlist>
+<contextlist><context>server config</context><context>virtual host</context></contextlist>
 
 <usage>
     <p>The <directive>TimeOut</directive> directive currently defines