httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1234876 - in /httpd/httpd/trunk/docs/manual/mod: core.html.en core.xml
Date Mon, 23 Jan 2012 16:13:08 GMT
Author: sf
Date: Mon Jan 23 16:13:08 2012
New Revision: 1234876

URL: http://svn.apache.org/viewvc?rev=1234876&view=rev
Log:
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=1234876&r1=1234875&r2=1234876&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Jan 23 16:13:08 2012
@@ -2029,13 +2029,9 @@ wildcard matching available in 2.3.6 and
     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
 
     <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

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1234876&r1=1234875&r2=1234876&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Mon Jan 23 16:13:08 2012
@@ -2013,13 +2013,9 @@ wildcard matching available in 2.3.6 and
     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
 
     <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



Mime
View raw message