You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by el...@apache.org on 2017/03/14 12:39:04 UTC
svn commit: r1786896 - in /httpd/httpd/branches/2.4.x/docs/manual: ./ howto/
Author: elukey
Date: Tue Mar 14 12:39:04 2017
New Revision: 1786896
URL: http://svn.apache.org/viewvc?rev=1786896&view=rev
Log:
Documentation rebuild
Modified:
httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ko
httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.zh-cn
httpd/httpd/branches/2.4.x/docs/manual/sections.html.en
httpd/httpd/branches/2.4.x/docs/manual/sections.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ko
httpd/httpd/branches/2.4.x/docs/manual/sections.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/sections.xml.tr
Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.fr?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.fr [utf-8] Tue Mar 14 12:39:04 2017
@@ -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 -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ja?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ja [utf-8] Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ko?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.ko [euc-kr] Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.meta?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.meta Tue Mar 14 12:39:04 2017
@@ -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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.zh-cn?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.zh-cn (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/howto/index.xml.zh-cn Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.html.en?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.html.en Tue Mar 14 12:39:04 2017
@@ -431,26 +431,35 @@ are interpreted, it is important to unde
</ol>
- <p>Apart from <code class="directive"><a href="./mod/core.html#directory"><Directory></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"><Directory></a></code> (group 1 above)
- is processed in the order shortest directory component to longest.
- So for example, <code><Directory "/var/web/dir"></code> will
- be processed before <code><Directory
- "/var/web/dir/subdir"></code>. If multiple <code class="directive"><a href="./mod/core.html#directory"><Directory></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"><VirtualHost></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"><Proxy></a></code>
- container takes the place of the <code class="directive"><a href="./mod/core.html#directory"><Directory></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"><Directory></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><Location "/foo/bar"></code> and
+ <code><Location "/foo"></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"><Directory></a></code>
+ (group 1 above) is processed in the order shortest directory
+ component to longest. For example,
+ <code><Directory "/var/web/dir"></code> will be processed before
+ <code><Directory "/var/web/dir/subdir"></code>.</li>
+ <li>If multiple <code class="directive"><a href="./mod/core.html#directory"><Directory></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"><VirtualHost></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"><Proxy></a></code>
+ container takes the place of the <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> container in the processing
+ order.</li>
+ </ul>
<div class="note"><h3>Technical Note</h3>
There is actually a
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml.fr?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml.fr [utf-8] Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ja?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ja [utf-8] Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ko?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml.ko [euc-kr] Tue Mar 14 12:39:04 2017
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml.meta?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml.meta Tue Mar 14 12:39:04 2017
@@ -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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml.tr?rev=1786896&r1=1786895&r2=1786896&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml.tr [utf-8] Tue Mar 14 12:39:04 2017
@@ -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>