From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 13 Oct 2005 18:49:44 +0000 (+0000)
Subject: Merge r315051 from trunk:
X-Git-Tag: 2.1.9~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b932e5d60ba30aafcc73cd631e1aa653dcaf981;p=thirdparty%2Fapache%2Fhttpd.git

Merge r315051 from trunk:

* Added further directives that are controlled via AllowOverride FileInfo



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 4f10298cb78..e4d0d771d5e 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -393,7 +393,26 @@ be passed through</description>
       module="core">SetInputFilter</directive>, <directive
       module="core">SetOutputFilter</directive>, and
       <module>mod_mime</module> Add* and Remove*
-      directives, <em>etc.</em>).</dd>
+      directives, <em>etc.</em>), document meta data (<directive
+      module="mod_headers">Header</directive>, <directive
+      module="mod_headers">RequestHeader</directive>, <directive
+      module="mod_setenvif">SetEnvIf</directive>, <directive
+      module="mod_setenvif">SetEnvIfNoCase</directive>, <directive
+      module="mod_setenvif">BrowserMatch</directive>, <directive
+      module="mod_usertrack">CookieExpires</directive>, <directive
+      module="mod_usertrack">CookieDomain</directive>, <directive
+      module="mod_usertrack">CookieStyle</directive>, <directive
+      module="mod_usertrack">CookieTracking</directive>, <directive
+      module="mod_usertrack">CookieName</directive>),
+      <module>mod_rewrite</module> directives <directive
+      module="mod_rewrite">RewriteEngine</directive>, <directive
+      module="mod_rewrite">RewriteOptions</directive>, <directive
+      module="mod_rewrite">RewriteBase</directive>, <directive
+      module="mod_rewrite">RewriteCond</directive>, <directive
+      module="mod_rewrite">RewriteRule</directive>) and
+      <directive module="mod_actions">Action</directive> from
+      <module>mod_actions</module>.
+      </dd>
 
       <dt>Indexes</dt>