From: Vincent Deffontaines <gryzor@apache.org>
Date: Thu, 18 Sep 2014 19:42:12 +0000 (+0000)
Subject: Fix previous commit - mutiple notes
X-Git-Tag: 2.2.30~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac519deded2038d51bd63c858b510b603794c173;p=thirdparty%2Fapache%2Fhttpd.git

Fix previous commit - mutiple notes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1626059 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 59fcf2f2a8d..bfa24e7c725 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2378,8 +2378,8 @@ resource </td></tr>
 <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.2.29 and later</td></tr>
 </table>
     <p>This directive controls whether HTTP trailers are copied into the
-    internal representation of HTTP headers. This mergeing occurs when the 
-    request body has been completely consumed, long after most header 
+    internal representation of HTTP headers. This mergeing occurs when the
+    request body has been completely consumed, long after most header
     processing would have a chance to examine or modify request headers.</p>
     <p>This option is provided for compatibility with releases prior to 2.4.10,
     where trailers were always merged.</p>
@@ -2728,6 +2728,13 @@ a resource</td></tr>
     then the interaction of these restrictions is controlled by
     the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive.</p>
 
+    <p>Multiple <code class="directive">Require</code> directives do operate as
+    logical "OR", but some underlying authentication modules may require
+    an explicit configuration to let authentication be chained to others.
+    This is typically the case with <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>,
+    which exports the <code class="directive">AuthzLDAPAuthoritative</code> in
+    that intent.</p>
+
     <div class="note"><h3>Removing controls in subdirectories</h3>
     <p>The following example shows how to use the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive to disable access
     controls in a subdirectory of a protected directory.  This
@@ -2750,14 +2757,6 @@ a resource</td></tr>
       &lt;/Directory&gt;<br />
     </code></p></div>
     </div>
-    <div class="note"><h3>Combined use of authentication backends</h3>
-    <p>Multiple <code class="directive">Require</code> directives do operate as
-    logical "OR", but some underlying authentication modules may require
-    an explicit configuration to let authentication be chained to others.
-    This is typically the case with <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>,
-    which exports the <code class="directive">AuthzLDAPAuthoritative</code> in
-    that intent.</p>
-    </div>
 
 
 <h3>See also</h3>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index f4f01f277ef..ab5c099fe9c 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2670,6 +2670,13 @@ a resource</description>
     then the interaction of these restrictions is controlled by
     the <directive module="core">Satisfy</directive> directive.</p>
 
+    <p>Multiple <directive>Require</directive> directives do operate as
+    logical "OR", but some underlying authentication modules may require
+    an explicit configuration to let authentication be chained to others.
+    This is typically the case with <module>mod_authnz_ldap</module>,
+    which exports the <directive>AuthzLDAPAuthoritative</directive> in
+    that intent.</p>
+
     <note><title>Removing controls in subdirectories</title>
     <p>The following example shows how to use the <directive
     module="core">Satisfy</directive> directive to disable access
@@ -2693,14 +2700,6 @@ a resource</description>
       &lt;/Directory&gt;<br />
     </example>
     </note>
-    <note><title>Combined use of authentication backends</title>
-    <p>Multiple <directive>Require</directive> directives do operate as
-    logical "OR", but some underlying authentication modules may require
-    an explicit configuration to let authentication be chained to others.
-    This is typically the case with <module>mod_authnz_ldap</module>,
-    which exports the <directive>AuthzLDAPAuthoritative</directive> in
-    that intent.</p>
-    </note>
 
 </usage>
 
@@ -3673,8 +3672,8 @@ hostname or IP address</description>
 
 <usage>
     <p>This directive controls whether HTTP trailers are copied into the
-    internal representation of HTTP headers. This mergeing occurs when the 
-    request body has been completely consumed, long after most header 
+    internal representation of HTTP headers. This mergeing occurs when the
+    request body has been completely consumed, long after most header
     processing would have a chance to examine or modify request headers.</p>
     <p>This option is provided for compatibility with releases prior to 2.4.10,
     where trailers were always merged.</p>