Commit a1344bab authored by Eric Covener's avatar Eric Covener
Browse files

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

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

(slightly different from trunk due to DirectoryMatch phrasing differences)



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

docs/manual/mod/core.xml

+5 −4
Changes for docs/manual/mod/core.xml: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ server cannot determine a type in any other way</description> 
<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>
@@ -659,8 +659,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
@@ -802,7 +803,7 @@ subdirectories</description> 
    <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  and

    <em>sub-directories of that directory</em>, the same as <directive

    <em>sub-directories of that directory</em> (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>

docs/manual/sections.xml

+2 −1
Changes for docs/manual/sections.xml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -155,7 +155,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>