diff options
author | Joshua Slive <slive@apache.org> | 2003-07-23 19:36:36 +0000 |
---|---|---|
committer | Joshua Slive <slive@apache.org> | 2003-07-23 19:36:36 +0000 |
commit | 20deaccf3edbea3d8df850de3e01b0649811a490 (patch) | |
tree | 7cac72b29ee59b60ba150532da0ec150706b4fe7 /docs | |
parent | 2f283a1dcd7dfc290cec4b1284892eb5af5de45c (diff) | |
download | httpd-20deaccf3edbea3d8df850de3e01b0649811a490.tar.gz |
Hit a couple files that hadn't been adapted to account
for the move from <Directory proxy:> to <proxy>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r-- | docs/manual/mod/directive-dict.html.en | 10 | ||||
-rw-r--r-- | docs/manual/mod/directive-dict.xml | 13 | ||||
-rw-r--r-- | docs/manual/mod/mod_headers.html.en | 26 | ||||
-rw-r--r-- | docs/manual/mod/mod_headers.xml | 30 | ||||
-rw-r--r-- | docs/manual/sections.html.en | 5 | ||||
-rw-r--r-- | docs/manual/sections.xml | 6 |
6 files changed, 37 insertions, 53 deletions
diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en index 3ce60ea7fb..eb831825d2 100644 --- a/docs/manual/mod/directive-dict.html.en +++ b/docs/manual/mod/directive-dict.html.en @@ -169,12 +169,10 @@ <dt>directory</dt> <dd>A directive marked as being valid in this context may be - used inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, - <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, - and <code class="directive"><a href="../mod/core.html#files"><Files></a></code> - containers in the server configuration files, subject to the - restrictions outlined in <a href="../sections.html">How - Directory, Location and Files sections work</a>.</dd> + used inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> containers + in the server configuration files, subject to the restrictions + outlined in <a href="../sections.html">Configuration + Sections</a>.</dd> <dt>.htaccess</dt> diff --git a/docs/manual/mod/directive-dict.xml b/docs/manual/mod/directive-dict.xml index d07acfc23a..1c82866d6c 100644 --- a/docs/manual/mod/directive-dict.xml +++ b/docs/manual/mod/directive-dict.xml @@ -147,12 +147,13 @@ <dd>A directive marked as being valid in this context may be used inside <directive module="core" - type="section">Directory</directive>, - <directive type="section" module="core">Location</directive>, - and <directive module="core" type="section">Files</directive> - containers in the server configuration files, subject to the - restrictions outlined in <a href="../sections.html">How - Directory, Location and Files sections work</a>.</dd> + type="section">Directory</directive>, <directive type="section" + module="core">Location</directive>, <directive module="core" + type="section">Files</directive>, and <directive + module="mod_proxy" type="section">Proxy</directive> containers + in the server configuration files, subject to the restrictions + outlined in <a href="../sections.html">Configuration + Sections</a>.</dd> <dt>.htaccess</dt> diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index 5402b6b23d..e855782041 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -50,27 +50,13 @@ is available only in Apache 2.0</td></tr></table> <div class="section"> <h2><a name="order" id="order">Order of Processing</a></h2> - <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can occur - almost anywhere within the server configuration. They are valid in the - main server config and virtual host sections, inside - <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, - <code class="directive"><a href="../mod/core.html#location"><Location></a></code> and - <code class="directive"><a href="../mod/core.html#files"><Files></a></code> sections, - and within <code>.htaccess</code> files.</p> + <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can + occur almost anywhere within the server configuration, and can be + limited in scope by enclosing them in <a href="../sections.html">configuration sections</a>.</p> - <p>The directives are processed in the following order:</p> - - <ol> - <li>main server</li> - <li>virtual host</li> - <li><code class="directive"><Directory></code> sections and - <code>.htaccess</code></li> - <li><code class="directive"><Files></code></li> - <li><code class="directive"><Location></code></li> - </ol> - - <p>Order is important. These two headers have a different - effect if reversed:</p> + <p>Order of processing is important and is affected both by the + order in the configuration file and by placement in <a href="../sections.html#mergin">configuration sections</a>. These + two headers have a different effect if reversed:</p> <div class="example"><p><code> RequestHeader append MirrorID "mirror 12"<br /> diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index 8630ebc128..a3043c34b9 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -20,27 +20,15 @@ is available only in Apache 2.0</compatibility> <section id="order"><title>Order of Processing</title> - <p>The directives provided by <module>mod_headers</module> can occur - almost anywhere within the server configuration. They are valid in the - main server config and virtual host sections, inside - <directive module="core" type="section">Directory</directive>, - <directive module="core" type="section">Location</directive> and - <directive module="core" type="section">Files</directive> sections, - and within <code>.htaccess</code> files.</p> - - <p>The directives are processed in the following order:</p> - - <ol> - <li>main server</li> - <li>virtual host</li> - <li><directive type="section">Directory</directive> sections and - <code>.htaccess</code></li> - <li><directive type="section">Files</directive></li> - <li><directive type="section">Location</directive></li> - </ol> - - <p>Order is important. These two headers have a different - effect if reversed:</p> + <p>The directives provided by <module>mod_headers</module> can + occur almost anywhere within the server configuration, and can be + limited in scope by enclosing them in <a + href="../sections.html">configuration sections</a>.</p> + + <p>Order of processing is important and is affected both by the + order in the configuration file and by placement in <a + href="../sections.html#mergin">configuration sections</a>. These + two headers have a different effect if reversed:</p> <example> RequestHeader append MirrorID "mirror 12"<br /> diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index 12483d1cee..0bd9ef0016 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -376,6 +376,11 @@ are interpreted, it is important to understand how this works.</p> 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>Later sections override earlier ones.</p> <div class="note"><h3>Technical Note</h3> diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 2685e4e498..7027d69cbe 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -400,6 +400,12 @@ are interpreted, it is important to understand how this works.</p> the virtual host definition. This allows virtual hosts to override the main server configuration.</p> + <p>When the request is served by <module>mod_proxy</module>, the + <directive module="mod_proxy" type="section">Proxy</directive> + container takes the place of the <directive module="core" + type="section">Directory</directive> container in the processing + order.</p> + <p>Later sections override earlier ones.</p> <note><title>Technical Note</title> |