Return-Path: 
 <cvs-return-51705-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 869EB1179E
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Thu, 18 Sep 2014 19:42:34 +0000 (UTC)
Received: (qmail 27240 invoked by uid 500); 18 Sep 2014 19:42:34 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 27180 invoked by uid 500); 18 Sep 2014 19:42:34 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 27170 invoked by uid 99); 18 Sep 2014 19:42:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 19:42:34 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 19:42:33 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 13EAC238899C;
	Thu, 18 Sep 2014 19:42:13 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1626059 - in
 /httpd/httpd/branches/2.2.x/docs/manual/mod:
 core.html.en core.xml
Date: Thu, 18 Sep 2014 19:42:12 -0000
To: cvs@httpd.apache.org
From: gryzor@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140918194213.13EAC238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gryzor
Date: Thu Sep 18 19:42:12 2014
New Revision: 1626059

URL: http://svn.apache.org/r1626059
Log:
Fix previous commit - mutiple notes

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en?rev=1626059&r1=1626058&r2=1626059&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en Thu Sep 18 19:42:12 2014
@@ -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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=1626059&r1=1626058&r2=1626059&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Thu Sep 18 19:42:12 2014
@@ -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>