Merge pull request #25408 from rallytime/bp-25399

Back-port #25399 to 2015.5

doc/ref/clientacl.rst

@@ -13,13 +13,15 @@ specified user. This configuration is much like the ``peer`` configuration:
 
 .. code-block:: yaml
 
-    # Allow thatch to execute anything and allow fred to use ping and pkg
     client_acl:
+      # Allow thatch to execute anything.
       thatch:
         - .*
+      # Allow fred to use test and pkg, but only on "web*" minions.
       fred:
-        - test.*
-        - pkg.*
+        - web*:
+          - test.*
+          - pkg.*
 
 Permission Issues
 =================
@@ -45,4 +47,4 @@ existing user keys and re-start the Salt master:
 .. code-block:: bash
 
     rm /var/cache/salt/.*key
-    service salt-master restart
+    service salt-master restart