You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2010/04/04 03:28:18 UTC
svn commit: r930606 [1/2] - in /httpd/httpd/trunk/docs/manual/mod:
core.html.en core.xml.de core.xml.ja core.xml.tr directives.html.en
quickreference.html.en
Author: rbowen
Date: Sun Apr 4 01:28:18 2010
New Revision: 930606
URL: http://svn.apache.org/viewvc?rev=930606&view=rev
Log:
Rebuild various transformations.
Modified:
httpd/httpd/trunk/docs/manual/mod/core.html.en
httpd/httpd/trunk/docs/manual/mod/core.xml.de
httpd/httpd/trunk/docs/manual/mod/core.xml.ja
httpd/httpd/trunk/docs/manual/mod/core.xml.tr
httpd/httpd/trunk/docs/manual/mod/directives.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
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=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Sun Apr 4 01:28:18 2010
@@ -61,7 +61,6 @@ available</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine"><IfDefine></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule"><IfModule></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#includestrict">IncludeStrict</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#limit"><Limit></a></li>
@@ -1574,8 +1573,7 @@ later.</td></tr>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes other configuration files from within
the server configuration files</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Include <var>file-path</var>|<var>directory-path</var>|
-<var>wildcard</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Include [<var>optional</var>|<var>strict</var>] <var>file-path</var>|<var>directory-path</var>|<var>wildcard</var></code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
@@ -1596,20 +1594,27 @@ 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 file or directory component of the
- path, and no file or directory matches the wildcard, the
- <code class="directive"><a href="#include">Include</a></code> directive will be
- silently ignored. When a directory or file component of the path is
+ <p>When a wildcard is specified for a <strong>file</strong> component of
+ the path, and no file matches the wildcard, the
+ <code class="directive"><a href="#include">Include</a></code>
+ 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
+ <code class="directive"><a href="#include">Include</a></code> directive will
+ <strong>fail with an error</strong> saying the directory cannot be found.
+ </p>
+
+ <p>For further control over the behaviour 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,
<code class="directive"><a href="#include">Include</a></code> 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.</p>
-
- <p>Under certain circumstances, it may be required for the server to fail
- explicitly when no files or directories match a specific wildcard. In these
- cases, use the <code class="directive"><a href="../mod/code.html#includestrict">IncludeStrict</a></code>
- directive instead.</p>
+ error saying the file or directory cannot be found.</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>
@@ -1629,54 +1634,28 @@ wildcard matching available in 2.3.6 and
</code></p></div>
<p>Wildcards may be included in the directory or file portion of the
- path:</p>
+ 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>
<div class="example"><p><code>
- Include conf/vhosts/*/vhost.conf
+ Include conf/vhosts/*/vhost.conf<br />
Include conf/vhosts/*/*.conf
</code></p></div>
+ <p>In this example, the server will fail to load if either
+ conf/vhosts/* matches no directories, or if *.conf matches no files:</p>
-<h3>See also</h3>
-<ul>
-<li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IncludeStrict" id="IncludeStrict">IncludeStrict</a> <a name="includestrict" id="includestrict">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes other configuration files from within the server
-configuration files, throwing an error if no files or directories match
-a wildcard
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IncludeStrict <var>file-path</var>|<var>directory-path</var>|
-<var>wildcard</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.3.6 and later</td></tr>
-</table>
- <p>This directive allows inclusion of other configuration files
- from within the server configuration files.</p>
-
- <p>It is functionally equivalent to the
- <code class="directive"><a href="#include">Include</a></code> directive, with the additional
- restriction that any wildcards are required to match at least one file or
- directory.</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>
-
- <p>Example:</p>
-
- <p>The server will fail to load if the wildcard path
- <var>/usr/local/apache2/conf/vhosts/*.conf</var> does not match at least
- one file or directory.</p>
+ <div class="example"><p><code>
+ Include strict conf/vhosts/*/*.conf
+ </code></p></div>
+
+ <p>In this example, the server load successfully if either conf/vhosts/*
+ matches no directories, or if *.conf matches no files:</p>
- <div class="example"><p><code>
- IncludeStrict /usr/local/apache2/conf/ssl.conf<br />
- IncludeStrict /usr/local/apache2/conf/vhosts/*.conf
- </code></p></div>
+ <div class="example"><p><code>
+ Include optional conf/vhosts/*/*.conf
+ </code></p></div>
<h3>See also</h3>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Sun Apr 4 01:28:18 2010
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:928916 (outdated) -->
+<!-- English Revision: 167959:929318 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Sun Apr 4 01:28:18 2010
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:928916 (outdated) -->
+<!-- English Revision: 669847:929318 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Sun Apr 4 01:28:18 2010
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:928916 (outdated) -->
+<!-- English Revision: 813376:929318 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=930606&r1=930605&r2=930606&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Sun Apr 4 01:28:18 2010
@@ -249,7 +249,6 @@
<li><a href="mod_imagemap.html#imapdefault">ImapDefault</a></li>
<li><a href="mod_imagemap.html#imapmenu">ImapMenu</a></li>
<li><a href="core.html#include">Include</a></li>
-<li><a href="core.html#includestrict">IncludeStrict</a></li>
<li><a href="mod_autoindex.html#indexheadinsert">IndexHeadInsert</a></li>
<li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
<li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>