Merge branch '2018.3' into bp-52149

doc/topics/beacons/index.rst

@@ -305,7 +305,7 @@ the minion. The ``beacon`` function therefore cannot block and should be as
 lightweight as possible. The ``beacon`` also must return a list of dicts, each
 dict in the list will be translated into an event on the master.
 
-Beacons may also choose to implement a ``__validate__`` function which
+Beacons may also choose to implement a ``validate`` function which
 takes the beacon configuration as an argument and ensures that it
 is valid prior to continuing. This function is called automatically
 by the Salt loader when a beacon is loaded.

doc/topics/proxyminion/index.rst

@@ -188,7 +188,7 @@ The key thing to remember is the left-most section of the diagram.  Salt's
 nature is to have a minion connect to a master, then the master may control
 the minion.  However, for proxy minions, the target device cannot run a minion.
 
-After the proxy minion is started and initiates its connection to the 'dumb'
+After the proxy minion is started and initiates its connection to the
 device, it connects back to the salt-master and for all intents and purposes
 looks like just another minion to the Salt master.
 
@@ -220,23 +220,23 @@ based on the diagram above:
 .. code-block:: yaml
 
     base:
-      dumbdevice1:
-        - dumbdevice1
-      dumbdevice2:
-        - dumbdevice2
-      dumbdevice3:
-        - dumbdevice3
-      dumbdevice4:
-        - dumbdevice4
-      dumbdevice5:
-        - dumbdevice5
-      dumbdevice6:
-        - dumbdevice6
-      dumbdevice7:
-        - dumbdevice7
+      net-device1:
+        - net-device1
+      net-device2:
+        - net-device2
+      net-device3:
+        - net-device3
+      i2c-device4:
+        - i2c-device4
+      i2c-device5:
+        - i2c-device5
+      433wireless-device6:
+        - 433wireless-device6
+      smsgate-device7:
+        - device7
 
 
-``/srv/pillar/dumbdevice1.sls``
+``/srv/pillar/net-device1.sls``
 
 .. code-block:: yaml
 
@@ -247,7 +247,7 @@ based on the diagram above:
       passwd: letmein
 
 
-``/srv/pillar/dumbdevice2.sls``
+``/srv/pillar/net-device2.sls``
 
 .. code-block:: yaml
 
@@ -258,7 +258,7 @@ based on the diagram above:
       passwd: letmein
 
 
-``/srv/pillar/dumbdevice3.sls``
+``/srv/pillar/net-device3.sls``
 
 .. code-block:: yaml
 
@@ -269,7 +269,7 @@ based on the diagram above:
       passwd: letmein
 
 
-``/srv/pillar/dumbdevice4.sls``
+``/srv/pillar/i2c-device4.sls``
 
 .. code-block:: yaml
 
@@ -278,7 +278,7 @@ based on the diagram above:
       i2c_address: 1
 
 
-``/srv/pillar/dumbdevice5.sls``
+``/srv/pillar/i2c-device5.sls``
 
 .. code-block:: yaml
 
@@ -287,7 +287,7 @@ based on the diagram above:
         i2c_address: 2
 
 
-``/srv/pillar/dumbdevice6.sls``
+``/srv/pillar/433wireless-device6.sls``
 
 .. code-block:: yaml
 
@@ -295,7 +295,7 @@ based on the diagram above:
         proxytype: 433mhz_wireless
 
 
-``/srv/pillar/dumbdevice7.sls``
+``/srv/pillar/smsgate-device7.sls``
 
 .. code-block:: yaml
 
@@ -309,18 +309,18 @@ the type of device that the proxy-minion is managing.
 
 In the above example
 
-- dumbdevices 1, 2, and 3 are network switches that have a management
+- net-devices 1, 2, and 3 are network switches that have a management
   interface available at a particular IP address.
 
-- dumbdevices 4 and 5 are very low-level devices controlled over an i2c bus.
+- i2c-devices 4 and 5 are very low-level devices controlled over an i2c bus.
   In this case the devices are physically connected to machine
   'minioncontroller2', and are addressable on the i2c bus at their respective
   i2c addresses.
 
-- dumbdevice6 is a 433 MHz wireless transmitter, also physically connected to
+- 433wireless-device6 is a 433 MHz wireless transmitter, also physically connected to
   minioncontroller2
 
-- dumbdevice7 is an SMS gateway connected to machine minioncontroller3 via a
+- smsgate-device7 is an SMS gateway connected to machine minioncontroller3 via a
   serial port.
 
 Because of the way pillar works, each of the salt-proxy processes that fork off the

salt/beacons/aix_account.py

@@ -27,7 +27,7 @@ def __virtual__():
                    'only available on AIX systems.')
 
 
-def __validate__(config):
+def validate(config):
     '''
     Validate the beacon configuration
     '''

salt/utils/minions.py

@@ -271,9 +271,10 @@ class CkMinions(object):
                              regex_match=False,
                              exact_match=False):
         '''
-        Helper function to search for minions in master caches
-        If 'greedy' return accepted minions that matched by the condition or absend in the cache.
-        If not 'greedy' return the only minions have cache data and matched by the condition.
+        Helper function to search for minions in master caches If 'greedy',
+        then return accepted minions matched by the condition or those absent
+        from the cache.  If not 'greedy' return the only minions have cache
+        data and matched by the condition.
         '''
         cache_enabled = self.opts.get('minion_data_cache', False)