remove mod_headers edit feature from new_features_2_4.xml

(back-ported to 2.2.x) and update transformation

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

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 9182d7b1623dd900d653f87cf9179cbecffb6f50..c6f56dcba6be34bd2f29ef391cca0fbda253c14e 100644 (file)
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -456,7 +456,7 @@ person in</a></h2>
         has been brought forward into authorization as well. What this means is 
         that the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive 
         not only specifies which authorization methods should be used, it also 
-        specifies the order in which they are called. Multiple autorization 
+        specifies the order in which they are called. Multiple authorization 
         methods are called in the same order in which the 
         <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directives appear 
         in the configuration.</p>

diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index c5e6f74e38435c9a3a9d34b0188f9c9dcafe756b..99edf98c0e3d2716c56e66d804649170c9a74a94 100644 (file)
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 219484:453083 (outdated) -->
+<!-- English Revision: 219484:479777 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index 9775af7be5ddf7f8d605137da3812c3be73a9a25..dc45e7108ea04c342db88bd0fdebac320ca21560 100644 (file)
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.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:453083 (outdated) -->
+<!-- English Revision: 105989:479777 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en
index d05c0ad314bf872aceb339e5fb5facc051daed13..c33cf95b1ef7d22c10c9f06b5643345b9afc99cc 100644 (file)
--- a/docs/manual/mod/mod_access_compat.html.en
+++ b/docs/manual/mod/mod_access_compat.html.en
@@ -96,7 +96,7 @@ server</td></tr>
 </table>
     <p>The <code class="directive">Allow</code> directive affects which hosts can
     access an area of the server. Access can be controlled by
-    hostname, IP Address, IP Address range, or by other
+    hostname, IP address, IP address range, or by other
     characteristics of the client request captured in environment
     variables.</p>
 
@@ -238,39 +238,79 @@ evaluated.</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
 </table>
-    <p>The <code class="directive">Order</code> directive controls the default
-    access state and the order in which <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are evaluated.
-    <var>Ordering</var> is one of</p>
+
+    <p>The <code class="directive">Order</code> directive, along with the
+    <code class="directive"><a href="#allow">Allow</a></code> and
+    <code class="directive"><a href="#deny">Deny</a></code> directives,
+    controls a three-pass access control system. The first pass
+    processes either all <code class="directive"><a href="#allow">Allow</a></code> or all <code class="directive"><a href="#deny">Deny</a></code> directives, as specified
+    by the <code class="directive"><a href="#order">Order</a></code>
+    directive. The second pass parses the rest of the directives
+    (<code class="directive"><a href="#deny">Deny</a></code> or
+    <code class="directive"><a href="#allow">Allow</a></code>). The third
+    pass applies to all requests which do not match either of the first
+    two.</p>
+
+    <p>Note that all <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are
+    processed, unlike a typical firewall, where only the first match is
+    used. The last match is effective (also unlike a typical firewall).
+    Additionally, the order in which lines appear in the configuration
+    files is not significant -- all <code class="directive"><a href="#allow">Allow</a></code> lines are processed as
+    one group, all <code class="directive"><a href="#deny">Deny</a></code> lines are considered as
+    another, and the default state is considered by itself.</p>
+
+    <p><em>Ordering</em> is one of:</p>
 
     <dl>
       <dt><code>Deny,Allow</code></dt>
 
-      <dd>The <code class="directive"><a href="#deny">Deny</a></code> directives
-      are evaluated before the <code class="directive"><a href="#allow">Allow</a></code> directives. Access is
-      allowed by default. Any client which does not match a
-      <code class="directive"><a href="#deny">Deny</a></code> directive or does
-      match an <code class="directive"><a href="#allow">Allow</a></code>
-      directive will be allowed access to the server.</dd>
+      <dd>First, all <code class="directive"><a href="#allow">Allow</a></code> directives are
+      evaluated; at least one must match, or the request is rejected.
+      Next, all <code class="directive"><a href="#deny">Deny</a></code>
+      directives are evaluated. If any matches, the request is rejected.
+      Last, any requests which do not match an <code class="directive"><a href="#allow">Allow</a></code> or a <code class="directive"><a href="#deny">Deny</a></code> directive are denied
+      by default.</dd>
 
       <dt><code>Allow,Deny</code></dt>
 
-      <dd>The <code class="directive"><a href="#allow">Allow</a></code>
-      directives are evaluated before the <code class="directive"><a href="#deny">Deny</a></code> directives. Access is denied
-      by default. Any client which does not match an <code class="directive"><a href="#allow">Allow</a></code> directive or does match a
-      <code class="directive"><a href="#deny">Deny</a></code> directive will be
-      denied access to the server.</dd>
+      <dd>First, all <code class="directive"><a href="#deny">Deny</a></code> directives are
+      evaluated; if any match, the request is denied
+      <strong>unless</strong> it also matches an <code class="directive"><a href="#allow">Allow</a></code> directive. Any
+      requests which do not match any <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directives are
+      permitted.</dd>
 
       <dt><code>Mutual-failure</code></dt>
 
-      <dd>Only those hosts which appear on the <code class="directive"><a href="#allow">Allow</a></code> list and do not appear on
-      the <code class="directive"><a href="#deny">Deny</a></code> list are
-      granted access. This ordering has the same effect as <code>Order
-      Allow,Deny</code> and is deprecated in favor of that
-      configuration.</dd>
+      <dd>This order has the same effect as <code class="directive">Order
+      Allow,Deny</code> and is deprecated in its favor.</dd>
     </dl>
 
-    <p>Keywords may only be separated by a comma; <em>no whitespace</em> is
-    allowed between them. Note that in all cases every <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> statement is evaluated.</p>
+    <p>Keywords may only be separated by a comma; <em>no whitespace</em>
+    is allowed between them.</p>
+
+    <table class="bordered">
+      <tr>
+        <th>Match</th>
+        <th>Allow,Deny result</th>
+        <th>Deny,Allow result</th>
+      </tr><tr>
+        <th>Match Allow only</th>
+        <td>Request allowed</td>
+        <td>Request allowed</td>
+      </tr><tr>
+        <th>Match Deny only</th>
+        <td>Request denied</td>
+        <td>Request denied</td>
+      </tr><tr>
+        <th>No match</th>
+        <td>Default to second directive: Denied</td>
+        <td>Default to second directive: Allowed</td>
+      </tr><tr>
+        <th>Match both Allow &amp; Deny</th>
+        <td>Final match controls: Denied</td>
+        <td>Final match controls: Allowed</td>
+      </tr>
+    </table>
 
     <p>In the following example, all hosts in the apache.org domain
     are allowed access; all other hosts are denied access.</p>
@@ -285,7 +325,8 @@ evaluated.</td></tr>
     allowed access, except for the hosts which are in the
     foo.apache.org subdomain, who are denied access. All hosts not
     in the apache.org domain are denied access because the default
-    state is to deny access to the server.</p>
+    state is to <code class="directive"><a href="#deny">Deny</a></code>
+    access to the server.</p>
 
     <div class="example"><p><code>
       Order Allow,Deny<br />
@@ -293,20 +334,21 @@ evaluated.</td></tr>
       Deny from foo.apache.org
     </code></p></div>
 
-    <p>On the other hand, if the <code class="directive">Order</code> in the last
-    example is changed to <code>Deny,Allow</code>, all hosts will
-    be allowed access. This happens because, regardless of the
-    actual ordering of the directives in the configuration file,
-    the <code>Allow from apache.org</code> will be evaluated last
-    and will override the <code>Deny from foo.apache.org</code>.
-    All hosts not in the <code>apache.org</code> domain will also
-    be allowed access because the default state will change to
-    <em>allow</em>.</p>
-
-    <p>The presence of an <code class="directive">Order</code> directive can affect
-    access to a part of the server even in the absence of accompanying
-    <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives because of its effect
-    on the default access state. For example,</p>
+    <p>On the other hand, if the <code class="directive">Order</code> in the
+    last example is changed to <code>Deny,Allow</code>, all hosts will
+    be allowed access. This happens because, regardless of the actual
+    ordering of the directives in the configuration file, the
+    <code>Allow from apache.org</code> will be evaluated last and will
+    override the <code>Deny from foo.apache.org</code>. All hosts not in
+    the <code>apache.org</code> domain will also be allowed access
+    because the default state is <code class="directive"><a href="#allow">Allow</a></code>.</p>
+
+    <p>The presence of an <code class="directive">Order</code> directive can
+    affect access to a part of the server even in the absence of
+    accompanying <code class="directive"><a href="#allow">Allow</a></code>
+    and <code class="directive"><a href="#deny">Deny</a></code>
+    directives because of its effect on the default access state. For
+    example,</p>
 
     <div class="example"><p><code>
       &lt;Directory /www&gt;<br />
@@ -316,9 +358,9 @@ evaluated.</td></tr>
       &lt;/Directory&gt;
     </code></p></div>
 
-    <p>will deny all access to the <code>/www</code> directory
-    because the default access state will be set to
-    <em>deny</em>.</p>
+    <p>will Deny all access to the <code>/www</code> directory
+    because the default access state is set to
+    <code class="directive"><a href="#deny">Deny</a></code>.</p>
 
     <p>The <code class="directive">Order</code> directive controls the order of access
     directive processing only within each phase of the server's

diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index 43f0e4f55e20b1fc36acba8d1df7e6a9011c87f9..22e235e028b40953110890f34b3e44fe520324f5 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:468892 (outdated) -->
+<!-- English Revision: 151408:478131 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 3288c202c31f25d2a102747d7e81f91bbe6d5724..f8d2b29de30b55665f7e78c1cc34d052efb8c826 100644 (file)
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:468892 (outdated) -->
+<!-- English Revision: 190982:478131 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 376bf207a232cdcefbb91475d02738f0a014cc7c..014a4ddeee00bc7a82c0a389d995b3f5361d66a3 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -440,7 +440,7 @@ URLs</td></tr>
 <tr><td><a href="core.html#locationmatch">&lt;LocationMatch
     <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Applies the enclosed directives only to regular-expression
 matching URLs</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the accept serialization lock file <em>(depreciated)</em></td></tr>
+<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the accept serialization lock file <em>(deprecated)</em></td></tr>
 <tr><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
 [<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Describes a format for use in a log file</td></tr>
 <tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the verbosity of the ErrorLog</td></tr>

diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index 4f18369728072ee119f9e0731528fa29487e0abf..7b671641a3f976fb6e6b783c2dbee2f33548c02e 100644 (file)
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -40,14 +40,7 @@
 <div class="section">
 <h2><a name="module" id="module">Module Enhancements</a></h2>
     
-    <dl>
-      <dt><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></dt>
-
-      <dd>Using the new <code>edit</code> argument, header values may
-          be edited using a regular expression search-and-replace
-          operation.</dd>
-    </dl>
-
+    
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="programs" id="programs">Program Enhancements</a></h2>

diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index 123198f5f99240d250b1c58d0f7cdcf94302fa2f..15f649c8314f55f957c66e9ec508d61682b5bb39 100644 (file)
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -39,14 +39,8 @@
 
   <section id="module">
     <title>Module Enhancements</title>
-    <dl>
-      <dt><module>mod_headers</module></dt>
-
-      <dd>Using the new <code>edit</code> argument, header values may
-          be edited using a regular expression search-and-replace
-          operation.</dd>
-    </dl>
-
+    <!-- <dl>
+    </dl> -->
   </section>
 
   <section id="programs">