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

diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 3ce60ea7fb4f544c368b9607a9a8a0c6aaba3208..eb831825d20dcfa9731a7f1518c27b003090ef96 100644 (file)
--- 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">&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>
-      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">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</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 d07acfc23aeda1fb31862e6fc98dc9acbfca31db..1c82866d6c3d2d2a905c75cdfcb99d77596f62cd 100644 (file)
--- 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 5402b6b23d4d2c94b54d788502853a364ea12050..e85578204163c7c14dcadd06b8d4d711988e9b87 100644 (file)
--- 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">&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,
-    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">&lt;Directory&gt;</code> sections and
-      <code>.htaccess</code></li>
-      <li><code class="directive">&lt;Files&gt;</code></li>
-      <li><code class="directive">&lt;Location&gt;</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 8630ebc128af7ec75d1ecc2a622b975cf2c7901b..a3043c34b9b7b250c98d26b0a82778e924e9ab6b 100644 (file)
--- 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 12483d1cee35c9410c8fb8bd1873fe79e8507321..0bd9ef0016878a5bb0069813bcc7579f8eb968a3 100644 (file)
--- 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">&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>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 2685e4e4982f51b743c24a0ec44b2f3392e7f79a..7027d69cbe5d39378e8af0ba3f75252d835eb0a5 100644 (file)
--- 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>