From: Stefan Fritsch <sf@apache.org>
Date: Mon, 23 Jan 2012 16:16:55 +0000 (+0000)
Subject: Merge r1234876:
X-Git-Tag: 2.4.1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a55af86f321fba13dedc31531f863aa11eac9d2;p=apache

Merge r1234876:
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 36570c7296..9ed410988c 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2029,13 +2029,9 @@ wildcard matching available in 2.3.6 and later</td></tr>
     pattern, such as *.conf, for example.</p>
 
     <p>The <code class="directive"><a href="#include">Include</a></code> directive will
-    <strong>fail with an error</strong> if a wildcard is specified for a
-    filename or directory component of the patch, but no file or directory
-    matches the wildcard. The same is true if a wildcard is specified for a
-    directory component of the path, and a mathing directory does not contain
-    the filename specified in the path. The
-    <code class="directive"><a href="#includeoptional">IncludeOptional</a></code> directive can be
-    used instead, if non-matching wildcards should be ignored.</p>
+    <strong>fail with an error</strong> if a wildcard expression does not
+    match any file. The <code class="directive"><a href="#includeoptional">IncludeOptional</a></code>
+    directive can be used if non-matching wildcards should be ignored.</p>
 
     <p>The file path specified may be an absolute path, or may be relative
     to the <code class="directive"><a href="#serverroot">ServerRoot</a></code> directory.</p>
@@ -2056,8 +2052,7 @@ wildcard matching available in 2.3.6 and later</td></tr>
 
     <p>Wildcards may be included in the directory or file portion of the
     path. This example will fail if there is no subdirectory in conf/vhosts
-    or if a subdirectory of conf/vhosts does not contain at least one *.conf
-    file:</p>
+    that contains at least one *.conf file:</p>
 
     <div class="example"><p><code>
       Include conf/vhosts/*/*.conf
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 6ea0fa16c7..edc0df35c4 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2013,13 +2013,9 @@ wildcard matching available in 2.3.6 and later</compatibility>
     pattern, such as *.conf, for example.</p>
 
     <p>The <directive module="core">Include</directive> directive will
-    <strong>fail with an error</strong> if a wildcard is specified for a
-    filename or directory component of the patch, but no file or directory
-    matches the wildcard. The same is true if a wildcard is specified for a
-    directory component of the path, and a mathing directory does not contain
-    the filename specified in the path. The
-    <directive module="core">IncludeOptional</directive> directive can be
-    used instead, if non-matching wildcards should be ignored.</p>
+    <strong>fail with an error</strong> if a wildcard expression does not
+    match any file. The <directive module="core">IncludeOptional</directive>
+    directive can be used if non-matching wildcards should be ignored.</p>
 
     <p>The file path specified may be an absolute path, or may be relative
     to the <directive module="core">ServerRoot</directive> directory.</p>
@@ -2041,8 +2037,7 @@ wildcard matching available in 2.3.6 and later</compatibility>
 
     <p>Wildcards may be included in the directory or file portion of the
     path. This example will fail if there is no subdirectory in conf/vhosts
-    or if a subdirectory of conf/vhosts does not contain at least one *.conf
-    file:</p>
+    that contains at least one *.conf file:</p>
 
     <example>
       Include conf/vhosts/*/*.conf