Return-Path: 
 <cvs-return-46216-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 0294AE787
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Mon, 21 Jan 2013 15:18:01 +0000 (UTC)
Received: (qmail 52674 invoked by uid 500); 21 Jan 2013 15:18:00 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 52612 invoked by uid 500); 21 Jan 2013 15:18:00 -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 52518 invoked by uid 99); 21 Jan 2013 15:17:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 15:17:57 +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; Mon, 21 Jan 2013 15:17:52 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 18AAB23888FE;
	Mon, 21 Jan 2013 15:17:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1436407 -
 /httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en
Date: Mon, 21 Jan 2013 15:17:33 -0000
To: cvs@httpd.apache.org
From: rbowen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130121151733.18AAB23888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rbowen
Date: Mon Jan 21 15:17:32 2013
New Revision: 1436407

URL: http://svn.apache.org/viewvc?rev=1436407&view=rev
Log:
2.4 style access control

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en

Modified: httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en?rev=1436407&r1=1436406&r2=1436407&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_macro.html.en Mon Jan 21 15:17:32 2013
@@ -27,14 +27,14 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_macro.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_macro.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This module provides usage of macros within apache runtime configuration files</td></tr>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This module provides usage of macros within apache httpd runtime configuration files</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>macro_module</td></tr>
 <tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_macro.c</td></tr></table>
 <h3>Summary</h3>
 
 
-    <p>This modules provides macros within apache runtime configuration files.
+    <p>This modules provides macros within apache httpd runtime configuration files.
     These macros have parameters.  They are expanded when used (parameters are
     substituted by their values given as an argument), and the result is
     processed normally.</p>
@@ -57,9 +57,9 @@
 
     <ul>
     <li> macro definition within a &lt;Macro&gt; section, following
-         the apache style.</li>
+         the httpd configuration style.</li>
     <li> user defined names for the macro and its parameters.</li>
-    <li> macro names are case-insensitive, like apache directives.</li>
+    <li> macro names are case-insensitive, like httpd directives.</li>
     <li> macro parameter names are case sensitive.</li>
     <li> macro parameters must have distinct names.</li>
     <li> error on empty parameter names.</li>
@@ -142,15 +142,11 @@ UndefMacro DirGroup
 
     <pre class="prettyprint lang-config">
 &lt;Macro LocalAccessPolicy&gt;
-  order deny,allow
-  deny from all
-  allow from 10.2.16.0/24
+    Require ip 10.2.16.0/24
 &lt;/Macro&gt;
 
 &lt;Macro RestrictedAccessPolicy $ipnumbers&gt;
-   order deny,allow
-   deny from all
-   allow from $ipnumbers
+    Require ip $ipnumbers
 &lt;/Macro&gt;
     </pre>
 
@@ -192,22 +188,18 @@ UndefMacro RestrictedAccessPolicy
     before processing.</p>
 
     <pre class="prettyprint lang-config">
-Use LocalAccessPolicy
-...
-Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"
+    Use LocalAccessPolicy
+    ...
+    Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"
     </pre>
 
 
     <p>is equivalent, with the macros defined above, to:</p>
 
     <pre class="prettyprint lang-config">
-order deny,allow
-deny from all
-allow from 10.2.16.0/24
-...
-order deny,allow
-deny from all
-allow from 192.54.172.0/24 192.54.148.0/24
+    Require ip 10.2.16.0/24
+    ...
+    Require ip 192.54.172.0/24 192.54.148.0/24
     </pre>