Merge pull request #32326 from bdrung/fix-typos

Fix typos

doc/topics/installation/windows.rst

@@ -429,7 +429,7 @@ in your Python directory.
 1. Remove all files that start with salt in the ``C:\Python27\Scripts``
    directory
 
-2. Remove all files and directorys that start with salt in the
+2. Remove all files and directories that start with salt in the
    ``C:\Python27\Lib\site-packages`` directory
 
 Install Salt

doc/topics/releases/2015.8.8.rst

@@ -161,7 +161,7 @@ Changes:
 
 - **PR** `#31770`_: (*anlutro*) Fix influxdb user functionality for version 0.9+
 
-- **PR** `#31743`_: (*Talkless*) Fix parentheses missmatch in documentation
+- **PR** `#31743`_: (*Talkless*) Fix parentheses mismatch in documentation
 
 - **PR** `#31162`_: (*isbm*) Remove MD5 digest from everywhere and default to SHA256
 
@@ -293,7 +293,7 @@ Changes:
 
 - **PR** `#31390`_: (*abednarik*) Fix Logrotate module.
 
-- **PR** `#31354`_: (*ticosax*) [dockerng] Dont require auth for all registries
+- **PR** `#31354`_: (*ticosax*) [dockerng] Don't require auth for all registries
 
 - **PR** `#31368`_: (*whiteinge*) Update list of netapi clients for autoclass
 

doc/topics/sdb/index.rst

@@ -71,7 +71,7 @@ Once an SDB driver is configured, you can use the ``sdb`` execution module to
 set and get values from it. There are two functions that will appear in any
 SDB module: ``set`` and ``get``.
 
-Getting a value requires only the SDB URI to be specified. To retreive a value
+Getting a value requires only the SDB URI to be specified. To retrieve a value
 from the ``kevinopenstack`` profile above, you would use:
 
 .. code-block:: bash
@@ -116,7 +116,7 @@ entry as usual, and set the value to the SDB URI. For instance:
     mykey: sdb://myetcd/mykey
 
 To retrieve this value using a module, the module in question must use the
-``config.get`` function to retrive configuration values. This would look
+``config.get`` function to retrieve configuration values. This would look
 something like:
 
 .. code-block:: python
@@ -141,7 +141,7 @@ If you would like to retrieve a key directly from SDB, you would call the
     {{ salt['sdb.get']('sdb://myetcd/mykey') }}
 
 When writing Salt modules, it is not recommended to call ``sdb.get`` directly,
-as it requires the user to provide vaules in SDB, using a specific URI. Use
+as it requires the user to provide values in SDB, using a specific URI. Use
 ``config.get`` instead.
 
 

doc/topics/tutorials/writing_tests.rst

@@ -405,7 +405,7 @@ testing the call to ``cp.hash_file``, which is used in ``cp.get_file``.
 
 Note that Salt's ``cp`` module is imported at the top of the file, along with all
 of the other necessary testing imports. The ``get_file`` function is then called
-directed in the testing function, instead of using the ``run_fucntion`` method as
+directed in the testing function, instead of using the ``run_function`` method as
 the integration test examples do above.
 
 The call to ``cp.get_file`` returns an empty string when a ``hash_file`` isn't found.

salt/client/__init__.py

@@ -1182,7 +1182,7 @@ class LocalClient(object):
                 log.warning('jid does not exist')
                 return ret
         except Exception as exc:
-            raise SaltClientError('Load could not be retreived from '
+            raise SaltClientError('Load could not be retrieved from '
                                   'returner {0}. Exception details: {1}'.format(
                                       self.opts['master_job_cache'],
                                       exc))

salt/client/ssh/wrapper/cp.py

@@ -65,7 +65,7 @@ def get_dir(path, dest, saltenv='base'):
 
 def get_url(path, dest, saltenv='base'):
     '''
-    retrive a URL
+    retrieve a URL
     '''
     src = __context__['fileclient'].get_url(
         path,

salt/log/handlers/sentry_mod.py

@@ -14,7 +14,7 @@
 
     Configuring the python `Sentry`_ client, `Raven`_, should be done under the
     ``sentry_handler`` configuration key. Additional `context` may be provided
-    for coresponding grain item(s).
+    for corresponding grain item(s).
     At the bare minimum, you need to define the `DSN`_. As an example:
 
     .. code-block:: yaml

salt/modules/cmdmod.py

@@ -962,7 +962,7 @@ def shell(cmd,
 
         This passes the cmd argument directly to the shell
         without any further processing! Be absolutely sure that you
-        have properly santized the command passed to this function
+        have properly sanitized the command passed to this function
         and do not use untrusted inputs.
 
     Note that ``env`` represents the environment variables for the command, and

salt/modules/file.py

@@ -1727,7 +1727,7 @@ def replace(path,
         ``True``/``False`` value if ``show_changes`` is set to ``False``).
 
     search_only : False
-        If set to true, this no changes will be perfomed on the file, and this
+        If set to true, this no changes will be performed on the file, and this
         function will simply return ``True`` if the pattern was matched, and
         ``False`` if not.
 

salt/modules/git.py

@@ -302,7 +302,7 @@ def _get_toplevel(path, user=None):
 
 def _git_config(cwd, user):
     '''
-    Helper to retrive git config options
+    Helper to retrieve git config options
     '''
     contextkey = 'git.config.' + cwd
     if contextkey not in __context__:

salt/modules/mine.py

@@ -72,7 +72,7 @@ def _mine_get(load, opts):
             load['tok'] = _auth().gen_token('salt')
         except AttributeError:
             log.error('Mine could not authenticate with master. '
-                      'Mine could not be retreived.'
+                      'Mine could not be retrieved.'
                       )
             return False
     channel = salt.transport.Channel.factory(opts)

salt/modules/neutron.py

@@ -994,7 +994,7 @@ def delete_security_group_rule(security_group_rule_id, profile=None):
     return conn.delete_security_group_rule(security_group_rule_id)
 
 
-def list_vpnservices(retrive_all=True, profile=None, **kwargs):
+def list_vpnservices(retrieve_all=True, profile=None, **kwargs):
     '''
     Fetches a list of all configured VPN services for a tenant
 
@@ -1004,12 +1004,12 @@ def list_vpnservices(retrive_all=True, profile=None, **kwargs):
 
         salt '*' neutron.list_vpnservices
 
-    :param retrive_all: True or False, default: True (Optional)
+    :param retrieve_all: True or False, default: True (Optional)
     :param profile: Profile to build on (Optional)
     :return: List of VPN service
     '''
     conn = _auth(profile)
-    return conn.list_vpnservices(retrive_all, **kwargs)
+    return conn.list_vpnservices(retrieve_all, **kwargs)
 
 
 def show_vpnservice(vpnservice, profile=None, **kwargs):

salt/modules/npm.py

@@ -109,7 +109,7 @@ def install(pkg=None,
         .. versionadded:: 2015.8.4
 
     silent
-        Wether or not to run NPM install with --silent flag.
+        Whether or not to run NPM install with --silent flag.
 
         .. versionadded:: 2015.8.5
 

salt/modules/pip.py

@@ -435,7 +435,7 @@ def install(pkgs=None,  # pylint: disable=R0912,R0913,R0914
         HTTPS.
 
     use_vt
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
 
     CLI Example:
 
@@ -783,7 +783,7 @@ def uninstall(pkgs=None,
     cwd
         Current working directory to run pip from
     use_vt
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
 
     CLI Example:
 

salt/modules/virtualenv_mod.py

@@ -92,7 +92,7 @@ def create(path,
         Set ownership for the virtualenv
 
     use_vt : False
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
 
         .. versionadded:: 2015.5.0
 

salt/modules/win_dacl.py

@@ -444,7 +444,7 @@ def rm_ace(path, objectType, user, permission=None, acetype=None, propagation=No
     acetypes:  either allow/deny for each user/permission (ALLOW, DENY)
     propagation: how the ACE applies to children for Registry Keys and Directories(KEY, KEY&SUBKEYS, SUBKEYS)
 
-    If any of the optional parameters are ommitted (or set to None) they act as wildcards.
+    If any of the optional parameters are omitted (or set to None) they act as wildcards.
 
     CLI Example:
 

salt/modules/win_status.py

@@ -164,7 +164,7 @@ def saltmem(human_readable=False):
     Returns the amount of memory that salt is using
 
     human_readable : False
-        return the value in a nicely formated number
+        return the value in a nicely formatted number
 
     CLI Example:
 

salt/runners/f5.py

@@ -5,7 +5,7 @@ Runner to provide F5 Load Balancer functionality
 :depends:   - pycontrol Python module
 
 :configuration: In order to connect to a F5 Load Balancer, you must specify
-    in the Salt master configuration the currently avilable load balancers
+    in the Salt master configuration the currently available load balancers
 
     .. code-block:: yaml
 

salt/states/bigip.py

@@ -2490,7 +2490,7 @@ def delete_virtual(hostname, username, password, name):
 
 def list_monitor(hostname, username, password, monitor_type, name):
     '''
-    A fucntion to list an exsiting monitor.
+    A function to list an exsiting monitor.
 
     hostname
         The host/address of the bigip device

salt/states/git.py

@@ -1733,7 +1733,7 @@ def config_unset(name,
         .. note::
             This option behaves differently depending on whether or not ``all``
             is set to ``True``. If it is, then all values matching the regex
-            will be deleted (this is the only way to delete mutliple values
+            will be deleted (this is the only way to delete multiple values
             from a multivar). If ``all`` is set to ``False``, then this state
             will fail if the regex matches more than one value in a multivar.
 

salt/states/pagerduty_escalation_policy.py

@@ -49,7 +49,7 @@ def present(profile='pagerduty', subdomain=None, api_key=None, **kwargs):
 
     This method accepts as args everything defined in
     https://developer.pagerduty.com/documentation/rest/escalation_policies/create.
-    In additonal, user and schedule id's will be translated from name (or email address)
+    In addition, user and schedule id's will be translated from name (or email address)
     into PagerDuty unique ids.  For example:
 
     .. code-block:: yaml

salt/states/pip_state.py

@@ -419,7 +419,7 @@ def installed(name,
                     VERBOSE: True
 
     use_vt
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
 
     trusted_host
         Mark this host as trusted, even though it does not have valid or any
@@ -833,7 +833,7 @@ def removed(name,
     bin_env : None
         the pip executable or virtualenenv to use
     use_vt
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
     '''
     ret = {'name': name, 'result': None, 'comment': '', 'changes': {}}
 
@@ -890,7 +890,7 @@ def uptodate(name,
     bin_env
         the pip executable or virtualenenv to use
     use_vt
-        Use VT terminal emulation (see ouptut while installing)
+        Use VT terminal emulation (see output while installing)
     '''
     ret = {'name': name,
            'changes': {},

salt/utils/cache.py

@@ -119,7 +119,7 @@ class CacheDisk(CacheDict):
             return {}
         with salt.utils.fopen(self._path, 'r') as fp_:
             cache = msgpack.load(fp_)
-        log.debug('Disk cache retreive: {0}'.format(cache))
+        log.debug('Disk cache retrieved: {0}'.format(cache))
         return cache
 
     def _write(self):

salt/utils/openstack/neutron.py

@@ -551,11 +551,11 @@ class SaltNeutron(NeutronShell):
             security_group_rule=sec_grp_rule_id)
         return ret if ret else True
 
-    def list_vpnservices(self, retrive_all=True, **kwargs):
+    def list_vpnservices(self, retrieve_all=True, **kwargs):
         '''
         Fetches a list of all configured VPN services for a tenant
         '''
-        return self.network_conn.list_vpnservices(retrive_all, **kwargs)
+        return self.network_conn.list_vpnservices(retrieve_all, **kwargs)
 
     def show_vpnservice(self, vpnservice, **kwargs):
         '''

salt/utils/schema.py

@@ -1009,11 +1009,11 @@ class NumberItem(BaseSchemaItem):
         :param minimum:
             The minimum allowed value
         :param exclusive_minimum:
-            Wether a value is allowed to be exactly equal to the minimum
+            Whether a value is allowed to be exactly equal to the minimum
         :param maximum:
             The maximum allowed value
         :param exclusive_maximum:
-            Wether a value is allowed to be exactly equal to the maximum
+            Whether a value is allowed to be exactly equal to the maximum
         '''
         if multiple_of is not None:
             self.multiple_of = multiple_of

tests/unit/modules/neutron_test.py

@@ -345,11 +345,11 @@ class MockNeutron(object):
         return security_group_rule_id
 
     @staticmethod
-    def list_vpnservices(retrive_all, **kwargs):
+    def list_vpnservices(retrieve_all, **kwargs):
         """
         Mock of list_vpnservices method
         """
-        return (retrive_all, kwargs)
+        return (retrieve_all, kwargs)
 
     @staticmethod
     def show_vpnservice(vpnservice, **kwargs):

tests/unit/utils/context_test.py

@@ -58,8 +58,8 @@ class ContextCacheTest(TestCase):
 
         # Test cache de-serialize
         cc = salt.utils.cache.ContextCache(__opts__, __name__)
-        retreived_cache = cc.get_cache_context()
-        self.assertDictEqual(retreived_cache, __context__)
+        retrieved_cache = cc.get_cache_context()
+        self.assertDictEqual(retrieved_cache, __context__)
 
     def test_refill_cache(self):
         '''