From 292ef9ffbc276b95860f3eab86ad8aafabc94f53 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Wed, 22 Aug 2012 11:27:38 +0000
Subject: [PATCH] Merge r1375996 from
 https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Authz*Authoritative removed between 2.2 and 2.4

http://httpd.apache.org/docs/2.4/upgrading.html#comment_222



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1375998 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/upgrading.html.en | 9 +++++++++
 docs/manual/upgrading.xml     | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 2e542b72d6..65166c5bdf 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -109,6 +109,15 @@
     which explains the new mechanisms for controlling the order in
     which the authorization directives are applied.</p>
 
+    <p>Directives that control how authorization modules respond when they don't match
+    the authenticated user have been removed: This includes 
+    AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative, 
+    AuthzGroupFileAuthoritative, AuthzUserAuthoritative,
+    and AuthzOwnerAuthoritative.   These directives have been replaced by the
+    more expressive <code class="directive"><a href="./mod/mod_authz_core.html#requireany">RequireAny</a></code>, 
+    <code class="directive"><a href="./mod/mod_authz_core.html#requirenone">RequireNone</a></code>, and
+    <code class="directive"><a href="./mod/mod_authz_core.html#requireaall">RequireAall</a></code>.</p>
+
     <h4><a name="access" id="access">Access control</a></h4>
       
 
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 6914149ad1..5a810df85b 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -106,6 +106,15 @@
     which explains the new mechanisms for controlling the order in
     which the authorization directives are applied.</p>
 
+    <p>Directives that control how authorization modules respond when they don't match
+    the authenticated user have been removed: This includes 
+    AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative, 
+    AuthzGroupFileAuthoritative, AuthzUserAuthoritative,
+    and AuthzOwnerAuthoritative.   These directives have been replaced by the
+    more expressive <directive module="mod_authz_core">RequireAny</directive>, 
+    <directive module="mod_authz_core">RequireNone</directive>, and
+    <directive module="mod_authz_core">RequireAall</directive>.</p>
+
     <section id="access">
       <title>Access control</title>
 
-- 
2.50.1