Small improvements in phrasing of the access control doc.

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

diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en
index 71154f4288de9f706f1c0cee9555ff6cd1be5da1..738d2cd1dc979a87940ddac63e9fd2e0b512e6c4 100644 (file)
--- a/docs/manual/howto/access.html.en
+++ b/docs/manual/howto/access.html.en
@@ -36,8 +36,8 @@
 
 <p>Access control can be done by several different modules. The most
 important of these are <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code> and
-<code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>. Other modules
-discussed in this document include <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+<code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>. Also discussed in this document 
+is access control using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -150,16 +150,25 @@ or before 7am. This technique can be used for any criteria that you wish
 to check. You can also redirect, or otherwise rewrite these requests, if
 that approach is preferred.</p>
 
+<p>The <code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code> directive,
+added in 2.4, replaces many things that <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> has
+traditionally been used to do, and you should probably look there first
+before resorting to mod_rewrite.</p>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="moreinformation" id="moreinformation">More information</a></h2>
-    <p>You should also read the documentation for
-    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> and <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> which
-    contain some more information about how this all works.
-    <code class="module"><a href="../mod/mod_authn_alias.html">mod_authn_alias</a></code> can also help in simplifying certain
-    authentication configurations.</p>
 
-    <p>See the <a href="auth.html">Authentication and Authorization</a>
+    <p>The <a href="../expr.html">expression engine</a> gives you a
+    great deal of power to do a variety of things based on arbitrary
+    server variables, and you should consult that document for more
+    detail.</p>
+
+    <p>Also, you should read the <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>
+    documentation for examples of combining multiple access requirements
+    and specifying how they interact.</p>
+
+    <p>See also the <a href="auth.html">Authentication and Authorization</a>
     howto.</p>
 </div></div>
 <div class="bottomlang">

diff --git a/docs/manual/howto/access.xml b/docs/manual/howto/access.xml
index 7d67c9a520b85d472753911bf905e0432bcb16cb..e27a7c26f98fab7ede086856f1f773b07aa88bdd 100644 (file)
--- a/docs/manual/howto/access.xml
+++ b/docs/manual/howto/access.xml
@@ -35,8 +35,8 @@
 
 <p>Access control can be done by several different modules. The most
 important of these are <module>mod_authz_core</module> and
-<module>mod_authz_host</module>. Other modules
-discussed in this document include <module>mod_rewrite</module>.</p>
+<module>mod_authz_host</module>. Also discussed in this document 
+is access control using <module>mod_rewrite</module>.</p>
 
 </section>
 
@@ -153,16 +153,25 @@ or before 7am. This technique can be used for any criteria that you wish
 to check. You can also redirect, or otherwise rewrite these requests, if
 that approach is preferred.</p>
 
+<p>The <directive type="section" module="core">If</directive> directive,
+added in 2.4, replaces many things that <module>mod_rewrite</module> has
+traditionally been used to do, and you should probably look there first
+before resorting to mod_rewrite.</p>
+
 </section>
 
 <section id="moreinformation"><title>More information</title>
-    <p>You should also read the documentation for
-    <module>mod_auth_basic</module> and <module>mod_authz_host</module> which
-    contain some more information about how this all works.
-    <module>mod_authn_alias</module> can also help in simplifying certain
-    authentication configurations.</p>
 
-    <p>See the <a href="auth.html">Authentication and Authorization</a>
+    <p>The <a href="../expr.html">expression engine</a> gives you a
+    great deal of power to do a variety of things based on arbitrary
+    server variables, and you should consult that document for more
+    detail.</p>
+
+    <p>Also, you should read the <module>mod_authz_core</module>
+    documentation for examples of combining multiple access requirements
+    and specifying how they interact.</p>
+
+    <p>See also the <a href="auth.html">Authentication and Authorization</a>
     howto.</p>
 </section>