summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Toscano <elukey@apache.org>2017-03-17 23:11:27 +0100
committerLuca Toscano <elukey@apache.org>2017-03-17 23:11:27 +0100
commite5ba6dbbf825de92cab86228a18453d34485f531 (patch)
tree3939f6c7e9af25d067c4b3a6fce2a92a9280a09f
parentAdd a warning in the docs about nested <If> blocks (diff)
downloadapache2-e5ba6dbbf825de92cab86228a18453d34485f531.tar.xz
apache2-e5ba6dbbf825de92cab86228a18453d34485f531.zip
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787511 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/core.html.en8
-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
-rw-r--r--docs/manual/sections.html.en3
-rw-r--r--docs/manual/sections.xml.fr2
-rw-r--r--docs/manual/sections.xml.ja2
-rw-r--r--docs/manual/sections.xml.ko2
-rw-r--r--docs/manual/sections.xml.tr2
12 files changed, 20 insertions, 11 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 974938ee43..69e2f06f48 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2205,6 +2205,14 @@ satisfied by a request at runtime</td></tr>
<p>Only directives that support the <a href="directive-dict.html#Context">directory context</a> can be used within this configuration section.</p>
+ <div class="note"><h3>Not a scripting language</h3>
+ The name of this directive is very familiar to programmers and admins
+ but it should not be confused with its counterpart in scripting languages.
+ For example, the current implementation does not contemplate the possibility
+ of having a <code class="directive">&lt;If&gt;</code> section inside another
+ one (the inner <code class="directive">&lt;If&gt;</code> will be ignored).
+ </div>
+
<div class="warning">
Certain variables, such as <code>CONTENT_TYPE</code> and other
response headers, are set after &lt;If&gt; conditions have already
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 8c44e5dc43..8bedbcfb94 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:1786113 (outdated) -->
+<!-- English Revision: 344972:1787510 (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 31f535d44c..d9bff5baa9 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:1786113 (outdated) -->
+<!-- English Revision: 1741251:1787510 (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 59c3689c6f..07bb53c429 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: 1786113 -->
+<!-- English Revision: 1786113:1787510 (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 fb155aa2d7..17cb0366e3 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:1786113 (outdated) -->
+<!-- English Revision: 669847:1787510 (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 852551cdd0..c4d704cd74 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:1786113 (outdated) -->
+<!-- English Revision: 1302855:1787510 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 9f9602082b..800754cc7e 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -337,7 +337,8 @@ hand, <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a><
inside <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>. On
the other hand, <code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code> can
be used inside <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>,
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, and <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> sections. The regex
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, and <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> sections (but not inside another
+<code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code>). The regex
counterparts of the named section behave identically.</p>
<p>Nested sections are merged after non-nested sections of the same type.</p>
diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr
index 47f10a45cf..290192c4a3 100644
--- a/docs/manual/sections.xml.fr
+++ b/docs/manual/sections.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1755977:1786709 (outdated) -->
+<!-- English Revision: 1755977:1787510 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja
index 4b74370570..e065e2ea78 100644
--- a/docs/manual/sections.xml.ja
+++ b/docs/manual/sections.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:1786709 (outdated) -->
+<!-- English Revision: 420990:1787510 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko
index 1f27381bdc..69b9032aa0 100644
--- a/docs/manual/sections.xml.ko
+++ b/docs/manual/sections.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: 105989:1786709 (outdated) -->
+<!-- English Revision: 105989:1787510 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.tr b/docs/manual/sections.xml.tr
index 3165fea811..8ca4bd2e2f 100644
--- a/docs/manual/sections.xml.tr
+++ b/docs/manual/sections.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: 1300910:1786709 (outdated) -->
+<!-- English Revision: 1300910:1787510 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>