From: William A. Rowe Jr Date: Mon, 29 Mar 2010 22:37:58 +0000 (+0000) Subject: Revert vetoed backport r925858 and related docs commits. X-Git-Tag: 2.2.16~92 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffef66576c01f2ff1812b2a76cf980cc0c19eb6c;p=thirdparty%2Fapache%2Fhttpd.git Revert vetoed backport r925858 and related docs commits. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928927 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 882168ad27f..5700d49dddd 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -1537,32 +1537,19 @@ the server configuration files Context:server config, virtual host, directory Status:Core Module:core -Compatibility:Wildcard matching available in 2.0.41 and later, directory -wildcard matching available in 2.3.6 and later +Compatibility:Wildcard matching available in 2.0.41 and later

This directive allows inclusion of other configuration files from within the server configuration files.

-

Shell-style (fnmatch()) wildcard characters can be used - in the filename or directory parts of the path to include several files - at once, in alphabetical order. In addition, if - Include points to a directory, rather than a file, - Apache will read all files in that directory and any subdirectory. - However, including entire directories is not recommended, because it is - easy to accidentally leave temporary files in a directory that can cause - httpd to fail. Instead, we encourage you to use the - wildcard syntax shown below, to include files that match a particular - pattern, such as *.conf, for example.

- -

When a wildcard is specified for a file or directory component of the - path, and no file or directory matches the wildcard, the - Include directive will be - silently ignored. When a directory or file component of the path is - specified exactly, and that directory or file does not exist, - Include directive will fail with an - error saying the file or directory cannot be found. This removes the need - for placeholder files to exist so that at least one file or directory is - found by the wildcard.

+

Shell-style (fnmatch()) wildcard characters can be used to + include several files at once, in alphabetical order. In + addition, if Include points to a directory, + rather than a file, Apache will read all files in that directory + and any subdirectory. But including entire directories is not + recommended, because it is easy to accidentally leave temporary + files in a directory that can cause httpd to + fail.

The file path specified may be an absolute path, or may be relative to the ServerRoot directory.

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 367e1970ae8..2ca23d418c2 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + + +