From: Richard Bowen <rbowen@apache.org>
Date: Mon, 21 Jan 2013 15:12:02 +0000 (+0000)
Subject: Update to 2.4-style Require syntax.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f3d4a4acf1719e0c8fcf759a27a1f0f864b58d9;p=thirdparty%2Fapache%2Fhttpd.git

Update to 2.4-style Require syntax.


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

diff --git a/docs/manual/mod/mod_macro.xml b/docs/manual/mod/mod_macro.xml
index 6935935bdab..ec1e56f19e7 100644
--- a/docs/manual/mod/mod_macro.xml
+++ b/docs/manual/mod/mod_macro.xml
@@ -130,15 +130,11 @@ UndefMacro DirGroup
 
     <highlight language="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;
     </highlight>
 </usage>
@@ -164,21 +160,17 @@ UndefMacro DirGroup
     before processing.</p>
 
     <highlight language="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"
     </highlight>
 
     <p>is equivalent, with the macros defined above, to:</p>
 
     <highlight language="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
     </highlight>
 </usage>