Return-Path: 
 <cvs-return-43392-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 BB069C0AB
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sat, 12 May 2012 07:47:06 +0000 (UTC)
Received: (qmail 38959 invoked by uid 500); 12 May 2012 07:47:06 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 38624 invoked by uid 500); 12 May 2012 07:47:01 -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 38551 invoked by uid 99); 12 May 2012 07:47:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 May 2012 07:47:00 +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; Sat, 12 May 2012 07:46:59 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CBA7E23889B3;
	Sat, 12 May 2012 07:46:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1337465 - /httpd/httpd/trunk/docs/manual/sections.xml
Date: Sat, 12 May 2012 07:46:38 -0000
To: cvs@httpd.apache.org
From: humbedooh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120512074638.CBA7E23889B3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: humbedooh
Date: Sat May 12 07:46:38 2012
New Revision: 1337465

URL: http://svn.apache.org/viewvc?rev=1337465&view=rev
Log:
Update access control examples to use 2.4 syntax.

Modified:
    httpd/httpd/trunk/docs/manual/sections.xml

Modified: httpd/httpd/trunk/docs/manual/sections.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml?rev=1337465&r1=1337464&r2=1337465&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml Sat May 12 07:46:38 2012
@@ -112,9 +112,9 @@ module is designed for the use in test s
 deal with different httpd versions and different configurations.</p>
 
 <highlight language="config">
-&lt;IfVersion >= 2.1&gt;
+&lt;IfVersion >= 2.4&gt;
     # this happens only in versions greater or
-    # equal 2.1.0.
+    # equal 2.4.0.
 &lt;/IfVersion&gt;
 </highlight>
 
@@ -176,8 +176,7 @@ of where it is found.</p>
 
 <highlight language="config">
 &lt;Files private.html&gt;
-    Order allow,deny
-    Deny from all
+    Require all denied
 &lt;/Files&gt;
 </highlight>
 
@@ -194,8 +193,7 @@ directory.</p>
 <highlight language="config">
 &lt;Directory /var/web/dir1&gt;
     &lt;Files private.html&gt;
-        Order allow,deny
-        Deny from all
+        Require all denied
     &lt;/Files&gt;
 &lt;/Directory&gt;
 </highlight>
@@ -216,8 +214,7 @@ as any other requests starting with the 
 
 <highlight language="config">
 &lt;LocationMatch ^/private&gt;
-    Order Allow,Deny
-    Deny from all
+    Require all denied
 &lt;/Location&gt;
 </highlight>
 
@@ -295,8 +292,7 @@ all user directories could look as follo
 at once:</p>
 <highlight language="config">
 &lt;FilesMatch \.(?i:gif|jpe?g|png)$&gt;
-    Order allow,deny
-    Deny from all
+    Require all denied
 &lt;/FilesMatch&gt;
 </highlight>
 
@@ -336,8 +332,7 @@ For example, consider the following conf
 
 <highlight language="config">
 &lt;Location /dir/&gt;
-    Order allow,deny
-    Deny from all
+    Require all denied
 &lt;/Location&gt;
 </highlight>
 
@@ -404,8 +399,7 @@ will prevent the proxy server from being
 
 <highlight language="config">
 &lt;Proxy http://www.example.com/*&gt;
-    Order allow,deny
-    Deny from all
+    Require all granted
 &lt;/Proxy&gt;
 </highlight>
 </section>
@@ -562,15 +556,15 @@ other words, order of merging is importa
 
 <highlight language="config">
 &lt;Location /&gt;
-    Order deny,allow
-    Allow from all
+    Require all granted
 &lt;/Location&gt;
 
 # Woops!  This &lt;Directory&gt; section will have no effect
 &lt;Directory /&gt;
-    Order allow,deny
-    Allow from all
-    Deny from badguy.example.com
+    &lt;RequireAll&gt;
+        Require all granted
+        Require not host badguy.example.com
+    &lt;/RequireAll&gt;
 &lt;/Directory&gt;
 </highlight>