From: Eric Covener <covener@apache.org>
Date: Tue, 30 Nov 2010 12:40:38 +0000 (+0000)
Subject: PR50376 clarify that <Directory> applies to the files under the Directory, not just... 
X-Git-Tag: 2.3.10~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f1cd329a95e1a23199851ed84b45e48432c2a7c;p=apache

PR50376 clarify that <Directory> applies to the files under the Directory, not just the directories themselves.



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 96f9105d69..b75f715a2b 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -554,7 +554,7 @@ which no other media type configuration could be found.
 <directivesynopsis type="section">
 <name>Directory</name>
 <description>Enclose a group of directives that apply only to the
-named file-system directory and sub-directories</description>
+named file-system directory, sub-directories, and their contents.</description>
 <syntax>&lt;Directory <var>directory-path</var>&gt;
 ... &lt;/Directory&gt;</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
@@ -563,8 +563,9 @@ named file-system directory and sub-directories</description>
 <usage>
     <p><directive type="section">Directory</directive> and
     <code>&lt;/Directory&gt;</code> are used to enclose a group of
-    directives that will apply only to the named directory and
-    sub-directories of that directory. Any directive that is allowed
+    directives that will apply only to the named directory,
+    sub-directories of that directory, and the files within the respective 
+    directories.  Any directive that is allowed
     in a directory context may be used. <var>Directory-path</var> is
     either the full path to a directory, or a wild-card string using
     Unix shell-style matching. In a wild-card string, <code>?</code> matches
@@ -695,7 +696,7 @@ named file-system directory and sub-directories</description>
 <directivesynopsis type="section">
 <name>DirectoryMatch</name>
 <description>Enclose directives that apply to
-file-system directories matching a regular expression.</description>
+the contents of file-system directories matching a regular expression.</description>
 <syntax>&lt;DirectoryMatch <var>regex</var>&gt;
 ... &lt;/DirectoryMatch&gt;</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
@@ -704,7 +705,7 @@ file-system directories matching a regular expression.</description>
 <usage>
     <p><directive type="section">DirectoryMatch</directive> and
     <code>&lt;/DirectoryMatch&gt;</code> are used to enclose a group
-    of directives which will apply only to the named directory, 
+    of directives which will apply only to the named directory (and the files within), 
     the same as <directive module="core" type="section">Directory</directive>. 
     However, it takes as an argument a 
     <glossary ref="regex">regular expression</glossary>.  For example:</p>
diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml
index bc22aa696d..a28d2c0e89 100644
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -156,7 +156,8 @@ counterparts, apply directives to
 parts of the filesystem.  Directives enclosed in a <directive
 type="section" module="core">Directory</directive> section apply to
 the named filesystem directory and all subdirectories of that
-directory.  The same effect can be obtained using <a
+directory (as well as the files in those directories).  
+The same effect can be obtained using <a
 href="howto/htaccess.html">.htaccess files</a>.  For example, in the
 following configuration, directory indexes will be enabled for the
 <code>/var/web/dir1</code> directory and all subdirectories.</p>