Return-Path: 
 <cvs-return-26036-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 53037 invoked from network); 16 Nov 2006 12:05:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Nov 2006 12:05:23 -0000
Received: (qmail 8741 invoked by uid 500); 16 Nov 2006 12:05:33 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 8695 invoked by uid 500); 16 Nov 2006 12:05:33 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 8684 invoked by uid 99); 16 Nov 2006 12:05:33 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 04:05:33 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 04:05:22 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id EE8F51A9846; Thu, 16 Nov 2006 04:04:50 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r475699 -
 /httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
Date: Thu, 16 Nov 2006 12:04:50 -0000
To: cvs@httpd.apache.org
From: trawick@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061116120450.EE8F51A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: trawick
Date: Thu Nov 16 04:04:50 2006
New Revision: 475699

URL: http://svn.apache.org/viewvc?view=rev&rev=475699
Log:
merge from trunk revision 475698:

TimeOut can be set in a vhost context

Submitted by: Eric Covener
Reviewed by:  Jeff Trawick

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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?view=diff&rev=475699&r1=475698&r2=475699
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Thu Nov 16 04:04:50 2006
@@ -3069,7 +3069,7 @@
 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