httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1234646 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/core.xml
Date Sun, 22 Jan 2012 23:31:49 GMT
Author: sf
Date: Sun Jan 22 23:31:49 2012
New Revision: 1234646

URL: http://svn.apache.org/viewvc?rev=1234646&view=rev
Log:
Merge r1234643:
Fix docs for Include, add docs for IncludeOptional

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 23:31:49 2012
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1231442,1231446,1232575,1232594,1234180,1234297,1234479,1234565,1234574,1234642
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1231442,1231446,1232575,1232594,1234180,1234297,1234479,1234565,1234574,1234642-1234643

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1234646&r1=1234645&r2=1234646&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Sun Jan 22 23:31:49 2012
@@ -1990,7 +1990,7 @@ later.</compatibility>
 <name>Include</name>
 <description>Includes other configuration files from within
 the server configuration files</description>
-<syntax>Include [<var>optional</var>|<var>strict</var>] <var>file-path</var>|<var>directory-path</var>|<var>wildcard</var></syntax>
+<syntax>Include <var>file-path</var>|<var>directory-path</var>|<var>wildcard</var></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
@@ -2012,27 +2012,14 @@ wildcard matching available in 2.3.6 and
     wildcard syntax shown below, to include files that match a particular
     pattern, such as *.conf, for example.</p>
 
-    <p>When a wildcard is specified for a <strong>file</strong> component
of
-    the path, and no file matches the wildcard, the
-    <directive module="core">Include</directive>
-    directive will be <strong>silently ignored</strong>. When a wildcard is
-    specified for a <strong>directory</strong> component of the path, and
-    no directory matches the wildcard, the
-    <directive module="core">Include</directive> directive will
-    <strong>fail with an error</strong> saying the directory cannot be found.
-    </p>
-
-    <p>For further control over the behavior of the server when no files or
-    directories match, prefix the path with the modifiers <var>optional</var>
-    or <var>strict</var>. If <var>optional</var> is specified, any
wildcard
-    file or directory that does not match will be silently ignored. If
-    <var>strict</var> is specified, any wildcard file or directory that does
-    not match at least one file will cause server startup to fail.</p>
-
-    <p>When a directory or file component of the path is
-    specified exactly, and that directory or file does not exist,
-    <directive module="core">Include</directive> directive will fail with an
-    error saying the file or directory cannot be found.</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>
 
     <p>The file path specified may be an absolute path, or may be relative
     to the <directive module="core">ServerRoot</directive> directory.</p>
@@ -2053,31 +2040,47 @@ wildcard matching available in 2.3.6 and
     </example>
 
     <p>Wildcards may be included in the directory or file portion of the
-    path. In the following example, the server will fail to load if no
-    directories match conf/vhosts/*, but will load successfully if no
-    files match *.conf.</p>
+    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>
 
     <example>
-      Include conf/vhosts/*/vhost.conf<br />
       Include conf/vhosts/*/*.conf
     </example>
 
-    <p>In this example, the server will fail to load if either
-    conf/vhosts/* matches no directories, or if *.conf matches no files:</p>
+    <p>Alternatively, the following command will just be ignored in case of
+    missing files or directories:</p>
 
     <example>
-      Include strict conf/vhosts/*/*.conf
+      IncludeOptional conf/vhosts/*/*.conf
     </example>
 
-    <p>In this example, the server load successfully if either conf/vhosts/*
-    matches no directories, or if *.conf matches no files:</p>
+</usage>
 
-    <example>
-      Include optional conf/vhosts/*/*.conf
-    </example>
+<seealso><directive module="core">IncludeOptional</directive></seealso>
+<seealso><program>apachectl</program></seealso>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>IncludeOptional</name>
+<description>Includes other configuration files from within
+the server configuration files</description>
+<syntax>IncludeOptional <var>file-path</var>|<var>directory-path</var>|<var>wildcard</var></syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context>
+</contextlist>
+<compatibility>Available in 2.3.6 and later</compatibility>
 
+<usage>
+    <p>This directive allows inclusion of other configuration files
+    from within the server configuration files. It works identically to the
+    <directive module="core">Include</directive> directive, with the
+    exception that if wildcards do not match any file or directory, the
+    <directive module="core">IncludeOptional</directive> directive will be
+    silently ignored instead of causing an error.</p>
 </usage>
 
+<seealso><directive module="core">Include</directive></seealso>
 <seealso><program>apachectl</program></seealso>
 </directivesynopsis>
 



Mime
View raw message