<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -33,6 +33,28 @@ Here is a hypothetical example of how a model can be created to have roles.
   &lt;/code&gt;
 &lt;/pre&gt;
 
+  Roles access can be mixed and matched
+&lt;pre&gt;
+  &lt;code&gt;
+    class MixedRoleAccessController &lt; ApplicationController
+
+      # Content Editor can only access the &quot;new&quot; action
+      grant_access_to :content_editor, :only =&gt; [:new, :create]
+
+      # Admin has access to only &quot;destroy&quot; but not &quot;new&quot;, &quot;publish&quot; or &quot;create&quot;
+      grant_access_to :admin,   :only =&gt; [:destroy]
+
+      # Editor has access to &quot;new&quot;, &quot;publish&quot; and &quot;create&quot; but not &quot;destroy&quot;
+      grant_access_to :editor,  :except =&gt; :destroy
+
+      def new;end
+      def create;end
+      def publish;end
+      def destroy;end
+    end
+  &lt;/code&gt;
+&lt;/pre&gt;
+
   You can also route around roles for entire controllers like this:
 &lt;pre&gt;
   &lt;code&gt;
@@ -45,21 +67,11 @@ Here is a hypothetical example of how a model can be created to have roles.
   Or you can designate certain actions public and certain actions role-required
   &lt;pre&gt;
     &lt;code&gt;
-      class MixedRoleAccessController &lt; ApplicationController
-
-        # Content Editor can only access the &quot;new&quot; action
-        grant_access_to :content_editor, :only =&gt; [:new, :create]
-
-        # Admin has access to only &quot;destroy&quot; but not &quot;new&quot;, &quot;publish&quot; or &quot;create&quot;
-        grant_access_to :admin,   :only =&gt; [:destroy]
-
-        # Editor has access to &quot;new&quot;, &quot;publish&quot; and &quot;create&quot; but not &quot;destroy&quot;
-        grant_access_to :editor,  :except =&gt; :destroy
-
-        def new;end
-        def create;end
-        def publish;end
-        def destroy;end
+      class MixedAuthenticatedNonAuthenticatedActionsController &lt; MockApplicationController
+        all_access_to :only =&gt; [:everybody_allowed]
+        grant_access_to [:admin]
+        def admin_only;end
+        def everybody_allowed;end
       end
     &lt;/code&gt;
   &lt;/pre&gt;</diff>
      <filename>README.textile</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>735ee7ea83ff94080514ac98e18bd988186e0661</id>
    </parent>
  </parents>
  <author>
    <name>Mark Daggett</name>
    <email>heavysixer@heavysixer.local</email>
  </author>
  <url>http://github.com/heavysixer/rolesystem/commit/8c286a4e5b6782e0135990e8dac22e57233e8da7</url>
  <id>8c286a4e5b6782e0135990e8dac22e57233e8da7</id>
  <committed-date>2009-06-25T09:53:11-07:00</committed-date>
  <authored-date>2009-06-25T09:53:11-07:00</authored-date>
  <message>Documentation was wrong.</message>
  <tree>24faac228bd2f06c2bafaa3ab7005f158fa09b57</tree>
  <committer>
    <name>Mark Daggett</name>
    <email>heavysixer@heavysixer.local</email>
  </committer>
</commit>
