From: Luca Toscano <elukey@apache.org>
Date: Fri, 19 Feb 2016 07:52:05 +0000 (+0000)
Subject: Documentation rebuild
X-Git-Tag: 2.5.0-alpha~2040
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3cc634d1362f6fb35becfec66a6edc842cbb78d;p=thirdparty%2Fapache%2Fhttpd.git

Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731193 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 3f89f98a897..cff69d667ef 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -478,33 +478,32 @@ are interpreted, it is important to understand how this works.</p>
     of the httpd to determine how they should act.</p>
     <p>An example can help to visualize the whole process. The following configuration uses the 
         <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code> directive of <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> to set
-        a specific HTTP header. What value will httpd set in the <code>foo</code> header for a request to
+        a specific HTTP header. What value will httpd set in the <code>CustomHeaderName</code> header for a request to
         <code>/example/index.html</code> ?
     </p>
     <pre class="prettyprint lang-config">&lt;Directory "/"&gt;
-    Header set foo one
+    Header set CustomHeaderName one
     &lt;FilesMatch ".*"&gt;
-        Header set foo three
+        Header set CustomHeaderName three
     &lt;/FilesMatch&gt;
 &lt;/Directory&gt;
 
 &lt;Directory "/example"&gt;
-    Header set foo two
+    Header set CustomHeaderName two
 &lt;/Directory&gt;</pre>
     
     <ul>
-        <li><code class="directive">Directory</code> "/" matches and an initial configuration to set the "foo" header with the value "one" is created.</li>
-        <li><code class="directive">Directory</code> "/example" matches, and since <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> specifies in its code to override in case of a merge, a new configuration is created to set the "foo" header with the value "two".</li>
-        <li><code class="directive">FilesMatch</code> ".*" matches and another merge opportunity arises, causing the "foo" header
-        to be set with the value "three".</li>
-        <li>Eventually during the next steps of the HTTP request processing <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> will be called and it will receive the configuration to set the "foo" header with the value "three". <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> normally uses this configuration to perfom its job, namely setting the foo header. This does not mean that a module can't perform a more complex action like discarding directives because not needed or deprecated, etc..</li>
+        <li><code class="directive">Directory</code> "/" matches and an initial configuration to set the <code>CustomHeaderName</code> header with the value <code>one</code> is created.</li>
+        <li><code class="directive">Directory</code> "/example" matches, and since <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> specifies in its code to override in case of a merge, a new configuration is created to set the <code>CustomHeaderName</code> header with the value <code>two</code>.</li>
+        <li><code class="directive">FilesMatch</code> ".*" matches and another merge opportunity arises, causing the <code>CustomHeaderName</code> header to be set with the value <code>three</code>.</li>
+        <li>Eventually during the next steps of the HTTP request processing <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> will be called and it will receive the configuration to set the <code>CustomHeaderName</code> header with the value <code>three</code>. <code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code> normally uses this configuration to perfom its job, namely setting the foo header. This does not mean that a module can't perform a more complex action like discarding directives because not needed or deprecated, etc..</li>
     </ul>
 
     <p>This is true for .htaccess too since they have the same priority as <code class="directive">Directory</code> in the merge order. The important concept to understand is that configuration sections like  <code class="directive">Directory</code> and <code class="directive">FilesMatch</code> are not comparable to module specific directives like <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code> or <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> because they operate on different levels.
     </p>
 
 
-<h3><a name="merge-examples" id="merge-examples">Some useful merge examples to practice</a></h3>
+<h3><a name="merge-examples" id="merge-examples">Some useful examples</a></h3>
 
 <p>Below is an artificial example to show the order of
 merging. Assuming they all apply to the request, the directives in