Commit a23733de authored by Vincent Deffontaines's avatar Vincent Deffontaines
Browse files

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
parent 781adc50

docs/manual/mod/core.html.en

+9 −10
Original line number Diff line number Diff line
@@ -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>

docs/manual/mod/core.xml

+9 −10
Original line number Diff line number Diff line
@@ -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>