From: Rich Bowen Date: Tue, 30 Nov 2010 13:13:32 +0000 (+0000) Subject: Rebuild various other recent tweaks in various languages. X-Git-Tag: 2.3.10~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02ed68bcacce49a614b617e2c006a17fad5e4a3d;p=apache Rebuild various other recent tweaks in various languages. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040509 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 57f4f18a2b..c9bd5b3a0b 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -607,7 +607,7 @@ which no other media type configuration could be found.

<Directory> Directive

+named file-system directory, sub-directories, and their contents. @@ -616,8 +616,9 @@ named file-system directory and sub-directories
Description:Enclose a group of directives that apply only to the -named file-system directory and sub-directories
Syntax:<Directory directory-path> ... </Directory>
Context:server config, virtual host

<Directory> and </Directory> 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. Directory-path is either the full path to a directory, or a wild-card string using Unix shell-style matching. In a wild-card string, ? matches @@ -746,7 +747,7 @@ named file-system directory and sub-directories

<DirectoryMatch> Directive

+the contents of file-system directories matching a regular expression. @@ -755,7 +756,7 @@ file-system directories matching a regular expression.
Description:Enclose directives that apply to -file-system directories matching a regular expression.
Syntax:<DirectoryMatch regex> ... </DirectoryMatch>
Context:server config, virtual host

<DirectoryMatch> and </DirectoryMatch> 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 <Directory>. However, it takes as an argument a regular expression. For example:

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 64e71dbcb8..3675340f9b 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + +