Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1127959 -
 /activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
Date: Thu, 26 May 2011 15:22:08 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
Message-Id: <20110526152208.4BCEC238897F@eris.apache.org>

Author: chirino
Date: Thu May 26 15:22:07 2011
New Revision: 1127959

URL: http://svn.apache.org/viewvc?rev=1127959&view=rev
Log:
Document that the admin/monitor acl actions can be configured on brokers, virtual hosts, queues and topics.

Modified:
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1127959&r1=1127958&r2=1127959&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Thu May 26 15:22:07 2011
@@ -557,7 +557,9 @@ against the resources. An example of `ac
 {pygmentize}
 
 If a configuration resource does not have an `acl` element defined within
-it, then the resource allows anyone to access all it's actions. The `acl`
+it, then the resource allows access if the containing resource would allow
+access to the action.  If the action is not defined in the containing
+resource then it allows anyone to access. The `acl`
 is made up of a list of authorization rule entries. Each entry defines
 that action the rule applies to and if the rule is allowing or denying
 access to a user principal. 
@@ -656,8 +658,9 @@ The type of resource being secured deter
 can be secured by the acl rule entries. Here is listing of which actions
 can be secured on which resources:
 
-* `broker`
+* `broker`, `virtual_host`, `topic`, and `queue`
   * `admin` : use of the administrative web interface
+  * `monitor` : read only use of the administrative web interface
 * `connector` and `virtual_host`
   * `connect` : allows connections to the connector or virtual host
 * `topic` and `queue` and `durable_subscription`