summaryrefslogtreecommitdiffstats
path: root/docs/manual/mod
diff options
context:
space:
mode:
authorLuca Toscano <elukey@apache.org>2017-11-13 11:22:04 +0100
committerLuca Toscano <elukey@apache.org>2017-11-13 11:22:04 +0100
commit02cda84c791b3dd3d8f8b7935a412df58f353c5d (patch)
tree864fd34720c2211ba8901bbc5cceb3a1c236bce0 /docs/manual/mod
parentFix false positive compiler warning (diff)
downloadapache2-02cda84c791b3dd3d8f8b7935a412df58f353c5d.tar.xz
apache2-02cda84c791b3dd3d8f8b7935a412df58f353c5d.zip
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815076 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/mod')
-rw-r--r--docs/manual/mod/core.html.en11
-rw-r--r--docs/manual/mod/core.xml.de2
-rw-r--r--docs/manual/mod/core.xml.es2
-rw-r--r--docs/manual/mod/core.xml.fr2
-rw-r--r--docs/manual/mod/core.xml.ja2
-rw-r--r--docs/manual/mod/core.xml.meta2
-rw-r--r--docs/manual/mod/core.xml.tr2
7 files changed, 12 insertions, 11 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index abd62796b1..8d05cbc8ac 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2560,14 +2560,15 @@ 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>Available in 2.3.6 and later</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.3.6 and later. Not existent file paths without wildcards
+ do not cause SyntaxError after 2.4.30</td></tr>
</table>
<p>This directive allows inclusion of other configuration files
from within the server configuration files. It works identically to the
- <code class="directive"><a href="#include">Include</a></code> directive, with the
- exception that if wildcards do not match any file or directory, the
- <code class="directive"><a href="#includeoptional">IncludeOptional</a></code> directive will be
- silently ignored instead of causing an error.</p>
+ <code class="directive"><a href="#include">Include</a></code> directive, but it will be
+ silently ignored (instead of causing an error) if wildcards are used and
+ they do not match any file or directory or if a file path does not exist
+ on the file system.</p>
<h3>See also</h3>
<ul>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 4e7c3e9bc5..d01777e1e3 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: 344972:1799680 (outdated) -->
+<!-- English Revision: 344972:1814968 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index da7cdd1685..4ad29e5e3c 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -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.es.xsl"?>
-<!-- English Revision: 1741251:1799680 (outdated) -->
+<!-- English Revision: 1741251:1814968 (outdated) -->
<!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
<!-- Reviewed by Sergio Ramos-->
<!--
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 3e63279bbe..3c9745b98e 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1799680 -->
+<!-- English Revision: 1799680:1814968 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index a17f4c564b..94afee630e 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:1799680 (outdated) -->
+<!-- English Revision: 669847:1814968 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index e78755527a..b9d96ee4c5 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -10,7 +10,7 @@
<variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">tr</variant>
</variants>
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 8868184160..5f75a2d652 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: 1302855:1799680 (outdated) -->
+<!-- English Revision: 1302855:1814968 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>