From: André Malo <nd@apache.org>
Date: Sun, 25 Apr 2004 11:42:45 +0000 (+0000)
Subject: backport changes from 2.1
X-Git-Tag: 2.0.50~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca25719af5bffa049cb15911026eb5a60f07bad8;p=thirdparty%2Fapache%2Fhttpd.git

backport changes from 2.1


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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index f993d372667..9d18927c413 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $Revision: 1.46.2.34 $ -->
+<!-- $Revision: 1.46.2.35 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -281,9 +281,10 @@ be passed through</description>
     <note><title>Only available in &lt;Directory&gt; sections</title>
     <directive>AllowOverride</directive> is valid only in
     <directive type="section" module="core">Directory</directive>
-    sections, not in <directive type="section"
-    module="core">Location</directive> or <directive type="section"
-    module="core">Files</directive> sections.
+    sections specified without regular expressions, not in <directive
+    type="section" module="core">Location</directive>, <directive
+    module="core" type="section">DirectoryMatch</directive> or
+    <directive type="section" module="core">Files</directive> sections.
     </note>
 
     <p>When this directive is set to <code>None</code>, then
@@ -366,6 +367,10 @@ be passed through</description>
     <example>
       AllowOverride AuthConfig Indexes
     </example>
+
+    <p>In the example above all directives that are neither in the group
+    <code>AuthConfig</code> nor <code>Indexes</code> cause an internal
+    server error.</p>
 </usage>
 
 <seealso><directive module="core">AccessFileName</directive></seealso>