From: Rich Bowen <rbowen@apache.org>
Date: Tue, 15 Feb 2011 14:05:08 +0000 (+0000)
Subject: Fix XML error. Rebuild access howto.
X-Git-Tag: 2.3.11~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcbb9bfa9fd32b67c96592b4e7829ae39a339407;p=apache

Fix XML error. Rebuild access howto.


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

diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en
index 738d2cd1dc..2a01f71fbf 100644
--- a/docs/manual/howto/access.html.en
+++ b/docs/manual/howto/access.html.en
@@ -48,13 +48,20 @@ is access control using <code class="module"><a href="../mod/mod_rewrite.html">m
     <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.
     </p>
 
-    <p>The <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> and
-    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> directives let
-    you allow and deny access based on the host name, or host
-    address, of the machine requesting a document. The
-    <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code> directive goes
-    hand-in-hand with these two, and tells Apache in which order to
-    apply the filters.</p>
+    <p>The <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
+    provides a variety of different ways to allow or deny access to
+    resources. In conjunction with the <code class="directive"><a href="../mod/mod_authz_core.html#requireall">RequireAll</a></code>, <code class="directive"><a href="../mod/mod_authz_core.html#requireany">RequireAny</a></code>, and <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">RequireNone</a></code> directives, these
+    requirements may be combined in arbitrarily complex ways, to enforce
+    whatever your access policy happens to be.</p>
+
+    <div class="warning"><p>
+    The <code class="directive"><a href="../mod/mod_access_compat.html#allow">Allow</a></code>,
+    <code class="directive"><a href="../mod/mod_access_compat.html#deny">Deny</a></code>, and 
+    <code class="directive"><a href="../mod/mod_access_compat.html#order">Order</a></code> directives,
+    provided by <code class="module"><a href="../mod/mod_access_compat.html">mod_access_compat</a></code>, are deprecated and
+    will go away in a future version. You should avoid using them, and
+    avoid outdated tutorials recommending their use.
+    </p></div>
 
     <p>The usage of these directives is:</p>
 
diff --git a/docs/manual/howto/access.xml b/docs/manual/howto/access.xml
index f35e0c2d58..13cbd9074a 100644
--- a/docs/manual/howto/access.xml
+++ b/docs/manual/howto/access.xml
@@ -57,7 +57,7 @@ is access control using <module>mod_rewrite</module>.</p>
     whatever your access policy happens to be.</p>
 
     <note type="warning"><p>
-    <p>The <directive module="mod_access_compat">Allow</directive>,
+    The <directive module="mod_access_compat">Allow</directive>,
     <directive module="mod_access_compat">Deny</directive>, and 
     <directive module="mod_access_compat">Order</directive> directives,
     provided by <module>mod_access_compat</module>, are deprecated and