Merge pull request #30303 from jacobhammons/pcre-match

Changed notes to indicate that functions are matched using regular ex…
This commit is contained in:
Mike Place 2016-01-12 12:15:16 -07:00
commit 48d2bd9e78
2 changed files with 3 additions and 4 deletions

View file

@ -68,7 +68,7 @@ allow minions ending with foo.org access to the publisher.
- pkg.*
.. note::
Minions are matched using regular expressions when configuring ``peer``.
Functions are matched using regular expressions.
Peer Runner Communication
=========================
@ -97,7 +97,7 @@ to the manage and jobs runner functions.
- jobs.*
.. note::
Minions are matched using regular expressions when configuring ``peer_run``.
Functions are matched using regular expressions.
Using Peer Communication
========================

View file

@ -57,6 +57,5 @@ few functions that dave can execute on other minions. It also allows steve
unrestricted access to salt commands.
.. note::
Minions are matched using regular expressions when configuring
``client_acl`` and ``external_auth``.
Functions are matched using regular expressions.