summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuca Toscano <elukey@apache.org>2017-03-20 12:16:52 +0000
committerLuca Toscano <elukey@apache.org>2017-03-20 12:16:52 +0000
commitaaad501f9d916ee96acf0233d6f6e5268969b17e (patch)
tree7a2214deb476079119e04f582cd8136aee4117b1 /docs
parentd16f53eb552452a2ae2190b9e4bf3ae5c33246a5 (diff)
downloadhttpd-aaad501f9d916ee96acf0233d6f6e5268969b17e.tar.gz
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787737 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-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.meta2
-rw-r--r--docs/manual/sections.xml.tr2
13 files changed, 21 insertions, 12 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 702436dda7..2c164de093 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2161,6 +2161,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 199efbce56..550da240fb 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:1782180 (outdated) -->
+<!-- English Revision: 344972:1787736 (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 88d3c38247..b702961612 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1741251:1782180 (outdated) -->
+<!-- English Revision: 1741251:1787736 (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 07ff692522..d3d06bfee7 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: 1782180 -->
+<!-- English Revision: 1782180:1787736 (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 8b8964f814..aef32e440c 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:1782180 (outdated) -->
+<!-- English Revision: 669847:1787736 (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 cc968f3edf..a1a0e9ed23 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: 1772678:1782180 (outdated) -->
+<!-- English Revision: 1772678:1787736 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index e5c1534dd4..6778313a39 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 905ef8acad..8a6e5a9e6b 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: 1786895 -->
+<!-- English Revision: 1786895:1787736 (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 c76703ec2f..4d046a0476 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:1786895 (outdated) -->
+<!-- English Revision: 420990:1787736 (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 8f57ca1fc3..45350a12f2 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:1786895 (outdated) -->
+<!-- English Revision: 105989:1787736 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.meta b/docs/manual/sections.xml.meta
index f5ac84359d..0e839c6dc7 100644
--- a/docs/manual/sections.xml.meta
+++ b/docs/manual/sections.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
diff --git a/docs/manual/sections.xml.tr b/docs/manual/sections.xml.tr
index f83667a19d..8714dfa854 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: 1755978:1786895 (outdated) -->
+<!-- English Revision: 1755978:1787736 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>