httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r925859 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: core.html.en core.xml.de core.xml.ja core.xml.meta core.xml.tr mod_cache.xml.ja mod_cache.xml.ko
Date Sun, 21 Mar 2010 18:41:20 GMT
Author: minfrin
Date: Sun Mar 21 18:41:20 2010
New Revision: 925859

URL: http://svn.apache.org/viewvc?rev=925859&view=rev
Log:
Update tranformations.

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ja
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ko

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en Sun Mar 21 18:41:20 2010
@@ -1537,19 +1537,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 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.  But 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.</p>
+    <p>Shell-style (<code>fnmatch()</code>) wildcard characters can be
used
+    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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de Sun Mar 21 18:41:20 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:896300 (outdated) -->
+<!-- English Revision: 167959:925858 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja [utf-8] Sun Mar 21 18:41:20 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: 608059:896300 (outdated) -->
+<!-- English Revision: 608059:925858 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.meta Sun Mar 21 18:41:20 2010
@@ -10,6 +10,6 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">ja</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.tr [utf-8] Sun Mar 21 18:41:20 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: 896300 -->
+<!-- English Revision: 896300:925858 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ja?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ja [utf-8] Sun Mar 21 18:41:20
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: 421100:917013 (outdated) -->
+<!-- English Revision: 421100:923738 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ko?rev=925859&r1=925858&r2=925859&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml.ko [euc-kr] Sun Mar 21 18:41:20
2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105569:917013 (outdated) -->
+<!-- English Revision: 105569:923738 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more



Mime
View raw message