Merge pull request #19422 from Seveland12/develop

Fixed spelling of "below" in 9 different files.

salt/client/__init__.py

@@ -1450,7 +1450,7 @@ class LocalClient(object):
         # When running tests, if self.events is not destroyed, we leak 2
         # threads per test case which uses self.client
         if hasattr(self, 'event'):
-            # The call bellow will take care of calling 'self.event.destroy()'
+            # The call below will take care of calling 'self.event.destroy()'
             del self.event
 
 

salt/cloud/__init__.py

@@ -702,7 +702,7 @@ class Cloud(object):
                         continue
 
                 for vm_name, details in vms.items():
-                    # XXX: The logic bellow can be removed once the aws driver
+                    # XXX: The logic below can be removed once the aws driver
                     # is removed
                     if vm_name not in names:
                         continue

salt/cloud/deploy/bootstrap-salt.sh

@@ -1256,7 +1256,7 @@ __check_end_of_life_versions() {
 
     case "${DISTRO_NAME_L}" in
         debian)
-            # Debian versions bellow 6 are not supported
+            # Debian versions below 6 are not supported
             if [ "$DISTRO_MAJOR_VERSION" -lt 6 ]; then
                 echoerror "End of life distributions are not supported."
                 echoerror "Please consider upgrading to the next stable. See:"

salt/config.py

@@ -2126,7 +2126,7 @@ def apply_master_config(overrides=None, defaults=None):
         if isinstance(opts['file_ignore_glob'], str):
             opts['file_ignore_glob'] = [opts['file_ignore_glob']]
 
-    # Let's make sure `worker_threads` does not drop bellow 3 which has proven
+    # Let's make sure `worker_threads` does not drop below 3 which has proven
     # to make `salt.modules.publish` not work under the test-suite.
     if opts['worker_threads'] < 3 and opts.get('peer', None):
         log.warning(

salt/utils/event.py

@@ -505,7 +505,7 @@ class SaltEvent(object):
     def destroy(self, linger=5000):
         if self.cpub is True and self.sub.closed is False:
             # Wait at most 2.5 secs to send any remaining messages in the
-            # socket or the context.term() bellow will hang indefinitely.
+            # socket or the context.term() below will hang indefinitely.
             # See https://github.com/zeromq/pyzmq/issues/102
             self.sub.setsockopt(zmq.LINGER, linger)
             self.sub.close()

tests/runtests.py

@@ -369,7 +369,7 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
             )
             status.append(results)
             # We executed ALL unittests, we can skip running unittests by name
-            # bellow
+            # below
             return status
 
         for name in named_unit_test:

tests/unit/config_test.py

@@ -284,7 +284,7 @@ class ConfigTestCase(TestCase, integration.AdaptedConfigurationTestCaseMixIn):
             )
 
             # Now, let's populate an extra configuration file under minion.d
-            # Notice that above we've set blah as False and bellow as True.
+            # Notice that above we've set blah as False and below as True.
             # Since the minion.d files are loaded after the main configuration
             # file so overrides can happen, the final value of blah should be
             # True.
@@ -319,7 +319,7 @@ class ConfigTestCase(TestCase, integration.AdaptedConfigurationTestCaseMixIn):
             )
 
             # Now, let's populate an extra configuration file under master.d
-            # Notice that above we've set blah as False and bellow as True.
+            # Notice that above we've set blah as False and below as True.
             # Since the master.d files are loaded after the main configuration
             # file so overrides can happen, the final value of blah should be
             # True.

tests/unit/utils/event_test.py

@@ -251,7 +251,7 @@ class TestSaltEvent(TestCase):
             # Fire events again
             me.fire_event({'data': 'foo3'}, 'evt3')
             me.fire_event({'data': 'foo4'}, 'evt4')
-            # We not force unrelated pending events not to be dropped, so both of the event bellow work and are not
+            # We not force unrelated pending events not to be dropped, so both of the event below work and are not
             # None
             evt2 = me.get_event(tag='evt4', use_pending=True)
             evt1 = me.get_event(tag='evt3', use_pending=True)

tests/unit/utils/which_test.py

@@ -21,7 +21,7 @@ class TestWhich(integration.TestCase):
     expected.
     '''
 
-    # The mock patch bellow will make sure that ALL calls to the which function
+    # The mock patch below will make sure that ALL calls to the which function
     # returns None
     @patch('salt.utils.which', lambda exe: None)
     def test_missing_binary_in_linux(self):
@@ -29,13 +29,13 @@ class TestWhich(integration.TestCase):
             salt.utils.which('this-binary-does-not-exist') is None
         )
 
-    # The mock patch bellow will make sure that ALL calls to the which function
+    # The mock patch below will make sure that ALL calls to the which function
     # return whatever is sent to it
     @patch('salt.utils.which', lambda exe: exe)
     def test_existing_binary_in_linux(self):
         self.assertTrue(salt.utils.which('this-binary-exists-under-linux'))
 
-    # The mock patch bellow, since we're not providing the return value, we
+    # The mock patch below, since we're not providing the return value, we
     # will be able to tweak it within the test case. The testcase MUST accept
     # an argument which is the MagicMock'ed object
     @patch('os.access')
@@ -84,7 +84,7 @@ class TestWhich(integration.TestCase):
                     None
                 )
 
-    # The mock patch bellow, since we're not providing the return value, we
+    # The mock patch below, since we're not providing the return value, we
     # will be able to tweak it within the test case. The testcase MUST accept
     # an argument which is the MagicMock'ed object
     @patch('os.access')