From: Joshua Slive <slive@apache.org>
Date: Tue, 29 Nov 2005 18:22:43 +0000 (+0000)
Subject: Merge r349776 from trunk:
X-Git-Tag: 2.2.1~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be30dd5eec98384a0fbccb8c5dbb58dce126513;p=thirdparty%2Fapache%2Fhttpd.git

Merge r349776 from trunk:

Fix a mixed-up module reference and document (carefully)
how to turn off require in a subdirectory.



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 4e663fb6920..0da8fdf2d77 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2394,7 +2394,7 @@ a resource</description>
     <p>This directive selects which authenticated users can access a
     resource.  The restrictions are processed by authorization
     modules.  Some of the allowed syntaxes provided by
-    <module>mod_authz_owner</module> and
+    <module>mod_authz_user</module> and
     <module>mod_authz_groupfile</module> are:</p>
 
     <dl>
@@ -2437,6 +2437,37 @@ a resource</description>
     place the <directive>Require</directive> statement into a
     <directive module="core" type="section">Limit</directive>
     section.</p>
+ 
+    <p>If <directive>Require</directive> is used together with 
+    the <directive module="mod_authz_host">Allow</directive> or
+    <directive module="mod_authz_host">Deny</directive> directives,
+    then the interaction of these restrictions is controlled by
+    the <directive module="core">Satisfy</directive> directive.</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
+    controls in a subdirectory of a protected directory.  This
+    technique should be used with caution, because it will also
+    disable any access controls imposed by
+    <module>mod_authz_host</module>.</p>
+    <example>
+      &lt;Directory /path/to/protected/&gt;<br />
+        <indent>
+        Require user david<br />
+        </indent>
+      &lt;/Directory&gt;<br />
+      &lt;Directory /path/to/protected/unprotected&gt;<br />
+        <indent>
+        # All access controls and authentication are disabled<br />
+        # in this directory<br />
+        Satisfy Any<br />
+        Allow from all<br />
+        </indent>
+      &lt;/Directory&gt;<br />
+    </example>
+    </note>
+      
 </usage>
 
 <seealso><a href="../howto/auth.html">Authentication, Authorization,