summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuca Toscano <elukey@apache.org>2017-03-14 12:39:04 +0000
committerLuca Toscano <elukey@apache.org>2017-03-14 12:39:04 +0000
commit248edbd3e41b897f87eda3d346b7f27a4e6ea815 (patch)
treed9585dc1c615cea2955b48173c22ca734865957d /docs
parentde48452300bbeda7411d4c7dc70bb7cdfd91e851 (diff)
downloadhttpd-248edbd3e41b897f87eda3d346b7f27a4e6ea815.tar.gz
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786896 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/howto/index.xml.fr2
-rw-r--r--docs/manual/howto/index.xml.ja2
-rw-r--r--docs/manual/howto/index.xml.ko2
-rw-r--r--docs/manual/howto/index.xml.meta2
-rw-r--r--docs/manual/howto/index.xml.zh-cn2
-rw-r--r--docs/manual/sections.html.en49
-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.meta4
-rw-r--r--docs/manual/sections.xml.tr2
11 files changed, 40 insertions, 31 deletions
diff --git a/docs/manual/howto/index.xml.fr b/docs/manual/howto/index.xml.fr
index 083b4226fd..583a182c1b 100644
--- a/docs/manual/howto/index.xml.fr
+++ b/docs/manual/howto/index.xml.fr
@@ -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.en.xsl"?>
-<!-- English Revision: 1738639 -->
+<!-- English Revision: 1738639:1786687 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/howto/index.xml.ja b/docs/manual/howto/index.xml.ja
index 31575a52fb..ca2810828d 100644
--- a/docs/manual/howto/index.xml.ja
+++ b/docs/manual/howto/index.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: 1597081:1738639 (outdated) -->
+<!-- English Revision: 1597081:1786687 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/index.xml.ko b/docs/manual/howto/index.xml.ko
index 9d8fa96589..0e54eeea56 100644
--- a/docs/manual/howto/index.xml.ko
+++ b/docs/manual/howto/index.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: 151408:1738639 (outdated) -->
+<!-- English Revision: 151408:1786687 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/index.xml.meta b/docs/manual/howto/index.xml.meta
index 75fbfff410..0e683ff376 100644
--- a/docs/manual/howto/index.xml.meta
+++ b/docs/manual/howto/index.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">zh-cn</variant>
diff --git a/docs/manual/howto/index.xml.zh-cn b/docs/manual/howto/index.xml.zh-cn
index e21bf5657e..5c65ada727 100644
--- a/docs/manual/howto/index.xml.zh-cn
+++ b/docs/manual/howto/index.xml.zh-cn
@@ -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.zh-cn.xsl"?>
-<!-- English Revision: 420990:1738639 (outdated) -->
+<!-- English Revision: 420990:1786687 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 7bad305c8c..e5c1534dd4 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -431,26 +431,35 @@ are interpreted, it is important to understand how this works.</p>
</ol>
- <p>Apart from <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, each group is processed in
- the order that they appear in the configuration files. <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (group 1 above)
- is processed in the order shortest directory component to longest.
- So for example, <code>&lt;Directory "/var/web/dir"&gt;</code> will
- be processed before <code>&lt;Directory
- "/var/web/dir/subdir"&gt;</code>. If multiple <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> sections apply
- to the same directory they are processed in the configuration file
- order. Configurations included via the <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive will be treated as if
- they were inside the including file at the location of the
- <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive.</p>
-
- <p>Sections inside <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> sections
- are applied <em>after</em> the corresponding sections outside
- the virtual host definition. This allows virtual hosts to
- override the main server configuration.</p>
-
- <p>When the request is served by <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>, the
- <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
- container takes the place of the <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> container in the processing
- order.</p>
+ <p>Some important remarks:</p>
+ <ul>
+ <li>Apart from <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, within each group the sections are
+ processed in the order they appear in the configuration files.
+ For example, a request for <em>/foo</em> will match
+ <code>&lt;Location "/foo/bar"&gt;</code> and
+ <code>&lt;Location "/foo"&gt;</code> (group 4 in this case):
+ both sections will be evaluated
+ but in the order they appear in the configuration files.</li>
+ <li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+ (group 1 above) is processed in the order shortest directory
+ component to longest. For example,
+ <code>&lt;Directory "/var/web/dir"&gt;</code> will be processed before
+ <code>&lt;Directory "/var/web/dir/subdir"&gt;</code>.</li>
+ <li>If multiple <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> sections apply
+ to the same directory they are processed in the configuration file
+ order.</li>
+ <li>Configurations included via the <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive will be treated as if
+ they were inside the including file at the location of the
+ <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive.</li>
+ <li>Sections inside <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> sections
+ are applied <em>after</em> the corresponding sections outside
+ the virtual host definition. This allows virtual hosts to
+ override the main server configuration.</li>
+ <li>When the request is served by <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>, the
+ <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+ container takes the place of the <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> container in the processing
+ order.</li>
+ </ul>
<div class="note"><h3>Technical Note</h3>
There is actually a
diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr
index 43ac3b14eb..cb1dd25fc5 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: 1755978 -->
+<!-- English Revision: 1755978:1786895 (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 61b279593d..c76703ec2f 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:1755978 (outdated) -->
+<!-- English Revision: 420990:1786895 (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 0dd8d2a48d..8f57ca1fc3 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:1755978 (outdated) -->
+<!-- English Revision: 105989:1786895 (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 4e91a361f4..0e839c6dc7 100644
--- a/docs/manual/sections.xml.meta
+++ b/docs/manual/sections.xml.meta
@@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/sections.xml.tr b/docs/manual/sections.xml.tr
index 5dfe40207e..f83667a19d 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 -->
+<!-- English Revision: 1755978:1786895 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>