From: Eric Covener <covener@apache.org>
Date: Mon, 6 Jun 2011 15:43:30 +0000 (+0000)
Subject: Merge r1132676 from trunk:
X-Git-Tag: 2.2.20~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d2d5bf5fff1d0d3fdabf2606b684cae60bfcb8b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1132676 from trunk:

TraceEnable is per-virtualhost, not just per-server.




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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 3c390f596da..c53c110cec9 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3323,7 +3323,7 @@ certain events before failing a request</description>
 requests</description>
 <syntax>TraceEnable <var>[on|off|extended]</var></syntax>
 <default>TraceEnable on</default>
-<contextlist><context>server config</context></contextlist>
+<contextlist><context>server config</context><context>virtual host</context></contextlist>
 <compatibility>Available in Apache 1.3.34, 2.0.55 and later</compatibility>
 
 <usage>