Merge pull request #26463 from rallytime/bp-26455

Back-port #26455 to 2015.8
This commit is contained in:
Justin Findlay 2015-08-19 10:07:47 -06:00
commit 1653ecbecd

View File

@ -460,7 +460,7 @@ are interested in. Here's an example:
The __proxyenabled__ directive
------------------------------
Salt execution moduless, by, and large, cannot "automatically" work
Salt execution modules, by, and large, cannot "automatically" work
with proxied devices. Execution modules like ``pkg`` or ``sqlite3`` have no
meaning on a network switch or a housecat. For an execution module to be
available to a proxy-minion, the ``__proxyenabled__`` variable must be defined