From: Graham Leggett <minfrin@apache.org>
Date: Sat, 13 Feb 2010 19:54:45 +0000 (+0000)
Subject: Update transformations.
X-Git-Tag: 2.3.6~481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c926949e0c6ddc2d450c58bcfae37c6354096be;p=thirdparty%2Fapache%2Fhttpd.git

Update transformations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@909881 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index 8f12daaf72a..cdc675bc889 100644
--- a/docs/manual/configuring.xml.de
+++ b/docs/manual/configuring.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 420990:892280 (outdated) -->
+<!-- English Revision: 420990:906779 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index 596744257ce..19ad841e6f1 100644
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:892280 (outdated) -->
+<!-- English Revision: 420990:906779 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.ko b/docs/manual/configuring.xml.ko
index 3a606ed4a61..f824becccee 100644
--- a/docs/manual/configuring.xml.ko
+++ b/docs/manual/configuring.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 420990:892280 (outdated) -->
+<!-- English Revision: 420990:906779 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/configuring.xml.tr b/docs/manual/configuring.xml.tr
index bf1e8ea00cd..ad78eee6730 100644
--- a/docs/manual/configuring.xml.tr
+++ b/docs/manual/configuring.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 830237:892280 (outdated) -->
+<!-- English Revision: 830237:906779 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 429720579ff..c4ba2552784 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1159,6 +1159,16 @@ request</td></tr>
     the server.  Also note that this setting cannot be changed
     during a graceful restart.</p>
 
+    <div class="note">
+    <p>Note that loading <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> will change 
+    the default behavior to ExtendedStatus On, while other
+    third party modules may do the same.  Such modules rely on
+    collecting detailed information about the state of all workers.
+    The default is changed by <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> beginning
+    with version 2.3.6; the previous default was always Off.</p>
+    </div>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">Directive</a></h2>
@@ -1567,22 +1577,32 @@ the server configuration files</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>Wildcard matching available in 2.0.41 and later</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Wildcard matching available in 2.0.41 and later, directory
+wildcard matching 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>Shell-style (<code>fnmatch()</code>) wildcard characters can be used
-    in the filename part of the path (not the directory part) to
-    include several files at once, in alphabetical order. In
-    addition, if <code class="directive">Include</code> 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 <code class="program"><a href="../programs/httpd.html">httpd</a></code> 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.</p>
+    in the filename or directory parts of the path to include several files
+    at once, in alphabetical order. In addition, if
+    <code class="directive">Include</code> 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
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> 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.</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
+    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>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>
@@ -1601,6 +1621,15 @@ the server configuration files</td></tr>
       Include conf/vhosts/*.conf
     </code></p></div>
 
+    <p>Wildcards may be included in the directory or file portion of the
+    path:</p>
+  
+    <div class="example"><p><code>
+      Include conf/vhosts/*/vhost.conf
+      Include conf/vhosts/*/*.conf
+    </code></p></div>
+
+
 <h3>See also</h3>
 <ul>
 <li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index ff7a3dc2c43..202c622584a 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -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:904853 (outdated) -->
+<!-- English Revision: 167959:909878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 75b9e744937..458d016f244 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -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:904853 (outdated) -->
+<!-- English Revision: 669847:909878 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 45e2289d254..7d1c35039a3 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -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:904853 (outdated) -->
+<!-- English Revision: 813376:909878 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index a376d503b82..79b1e8220ff 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -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: 344971:894526 (outdated) -->
+<!-- English Revision: 344971:909323 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy_connect.xml.ja b/docs/manual/mod/mod_proxy_connect.xml.ja
index 4e3539c6275..1794f08bf98 100644
--- a/docs/manual/mod/mod_proxy_connect.xml.ja
+++ b/docs/manual/mod/mod_proxy_connect.xml.ja
@@ -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: 669473:894522 (outdated) -->
+<!-- English Revision: 669473:909323 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more