more typo fixes

HACKING.rst

@@ -236,7 +236,7 @@ Edit the minion config file:
     config file. Without the ``-c`` option, Salt finds its config files in
     `/etc/salt`.
 
-Start the master and minion, accept the minon's key, and verify your local Salt
+Start the master and minion, accept the minion's key, and verify your local Salt
 installation is working::
 
     cd /path/to/your/virtualenv

doc/topics/hacking.rst

@@ -237,7 +237,7 @@ Edit the minion config file:
     config file. Without the ``-c`` option, Salt finds its config files in
     `/etc/salt`.
 
-Start the master and minion, accept the minon's key, and verify your local Salt
+Start the master and minion, accept the minion's key, and verify your local Salt
 installation is working::
 
     cd /path/to/your/virtualenv

doc/topics/installation/windows.rst

@@ -160,7 +160,7 @@ Install on Windows XP 32bit
         cd ./salt
         python setup.py install
 
-18.  Edit c:\\etc\\salt\\minon
+18.  Edit c:\\etc\\salt\\minion
 
 .. code-block:: bash
 

doc/topics/tutorials/walkthrough.rst

@@ -111,7 +111,7 @@ Setting up a Salt Minion
     assumes that the minion will be connected to the master, for information on
     how to run a master-less minion please see the masterless quickstart guide:
 
-        :doc:`Masterless Minon Quickstart </topics/tutorials/quickstart>`
+        :doc:`Masterless Minion Quickstart </topics/tutorials/quickstart>`
 
 The Salt Minion only needs to be aware of one piece of information to run, the
 network location of the master. By default the minion will look for the DNS

salt/config.py

@@ -389,7 +389,7 @@ def get_id():
 
     # Can /etc/hosts help us?
     try:
-        # TODO Add windoes host file support
+        # TODO Add Windows host file support
         with open('/etc/hosts') as f:
             line = f.readline()
             while line:

salt/master.py

@@ -157,7 +157,7 @@ def __init__(self, opts):
 
     def _clear_old_jobs(self):
         '''
-        The clean old jobs function is the geenral passive maintinance process
+        The clean old jobs function is the general passive maintenance process
         controller for the Salt master. This is where any data that needs to
         be cleanly maintained from the master is maintained.
         '''

salt/modules/apt.py

@@ -406,7 +406,7 @@ def purge(pkg, **kwargs):
         except Exception as e:
             log.exception(e)
 
-    # Remove inital package
+    # Remove initial package
     purge_cmd = 'apt-get -q -y purge {0}'.format(pkg)
     out = __salt__['cmd.run_all'](purge_cmd)
     if out['retcode'] != 0:

salt/modules/debian_service.py

@@ -176,7 +176,7 @@ def disable(name, **kwargs):
 
 def enabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     CLI Example::
 
@@ -187,7 +187,7 @@ def enabled(name):
 
 def disabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     CLI Example::
 

salt/modules/freebsdservice.py

@@ -192,7 +192,7 @@ def disable(name, **kwargs):
 
 def enabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     name
         Service name
@@ -219,7 +219,7 @@ def enabled(name):
 
 def disabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     CLI Example::
 

salt/modules/gentoo_service.py

@@ -134,7 +134,7 @@ def disable(name, **kwargs):
 
 def enabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     CLI Example::
 
@@ -144,7 +144,7 @@ def enabled(name):
 
 def disabled(name):
     '''
-    Return True if the named servioce is enabled, false otherwise
+    Return True if the named service is enabled, false otherwise
 
     CLI Example::
 

salt/modules/layman.py

@@ -43,7 +43,7 @@ def add(overlay):
     __salt__['cmd.retcode'](cmd)
     new_overlays = list_local()
 
-    # If we did not have any overlays before and we sucessfully added
+    # If we did not have any overlays before and we successfully added
     # a new one. We need to ensure the make.conf is sourcing layman's
     # make.conf so emerge can see the overlays
     if len(old_overlays) == 0 and len(new_overlays) > 0:

salt/modules/nova.py

@@ -410,7 +410,7 @@ def _item_list():
 #aggregate-details   Show details of the specified aggregate.
 #aggregate-list      Print a list of all aggregates.
 #aggregate-remove-host
-#                    Remove the specified host from the specfied aggregate.
+#                    Remove the specified host from the specified aggregate.
 #aggregate-set-metadata
 #                    Update the metadata associated with the aggregate.
 #aggregate-update    Update the aggregate's name and optionally

salt/modules/pacman.py

@@ -239,7 +239,7 @@ def install(name=None,
             # Allow "version" to work for single package target
             pkg_params = {name: version}
         else:
-            log.warning('"version" parameter will be ignored for muliple '
+            log.warning('"version" parameter will be ignored for multiple '
                         'package targets')
 
     if pkg_type == 'file':

salt/modules/qemu_nbd.py

@@ -94,7 +94,7 @@ def clear(mnt):
     '''
     Pass in the mnt dict returned from nbd_mount to unmount and disconnect
     the image from nbd. If all of the partitions are unmounted return an
-    empy dict, otherwise return a dict containing the still mounted
+    empty dict, otherwise return a dict containing the still mounted
     partitions
 
     CLI Example::

salt/modules/rh_ip.py

@@ -388,7 +388,7 @@ def _parse_settings_bond_3(opts, iface, bond_def):
                 int(opts[binding])
                 bond.update({binding: opts[binding]})
             except Exception:
-                _raise_error_iface(iface, binding, ['interger'])
+                _raise_error_iface(iface, binding, ['integer'])
         else:
             _log_default_iface(iface, binding, bond_def[binding])
             bond.update({binding: bond_def[binding]})

salt/modules/s3.py

@@ -68,7 +68,7 @@ def get(bucket=None, path=None, return_bin=False, action=None,
         local_file=None, key=None, keyid=None, service_url=None):
     '''
     List the contents of a bucket, or return an object from a bucket. Set
-    return_bin to True in order to retreive an object wholesale. Otherwise,
+    return_bin to True in order to retrieve an object wholesale. Otherwise,
     Salt will attempt to parse an XML response.
 
     CLI Example to list buckets::

salt/modules/status.py

@@ -74,7 +74,7 @@ def procs():
 
 def custom():
     '''
-    Return a custom composite of status data and info for this minon,
+    Return a custom composite of status data and info for this minion,
     based on the minion config file. An example config like might be::
 
         status.cpustats.custom: [ 'cpu', 'ctxt', 'btime', 'processes' ]
@@ -136,7 +136,7 @@ def loadavg():
 
 def cpustats():
     '''
-    Return the CPU stats for this minon
+    Return the CPU stats for this minion
 
     CLI Example::
 

salt/modules/sysmod.py

@@ -23,7 +23,7 @@ def __virtual__():
 def doc(module=''):
     '''
     Return the docstrings for all modules. Optionally, specify a module or a
-    function to narrow te selection.
+    function to narrow the selection.
 
     The strings are aggregated into a single document on the master for easy
     reading.

salt/modules/tls.py

@@ -515,7 +515,7 @@ def create_ca_signed_cert(ca_name, CN, days=365):
     CN
         common name matching the certificate signing request
     days
-        number of days certficate is valid, default is 365 (1 year)
+        number of days certificate is valid, default is 365 (1 year)
 
     Writes out a Certificate (CERT) If the file already
     exists, the function just returns assuming the CERT already exists.

salt/modules/tomcat.py

@@ -398,7 +398,7 @@ def deploy_war(war, context, force='no', url='http://localhost:8080/manager', en
     Deploy a war file
     
     war
-        absolute path to war file (should be accessable by the user running
+        absolute path to war file (should be accessible by the user running
         tomcat) or a path supported by the salt.modules.cp.get_file function
     context
         the context path to deploy

salt/modules/yumpkg.py

@@ -472,7 +472,7 @@ def install(name=None,
             # Allow "version" to work for single package target
             pkg_params = {name: version}
         else:
-            log.warning('"version" parameter will be ignored for muliple '
+            log.warning('"version" parameter will be ignored for multiple '
                         'package targets')
 
     error = _set_repo_options(yumbase, **kwargs)

salt/modules/yumpkg5.py

@@ -321,7 +321,7 @@ def install(name=None,
             # Allow "version" to work for single package target
             pkg_params = {name: version}
         else:
-            log.warning('"version" parameter will be ignored for muliple '
+            log.warning('"version" parameter will be ignored for multiple '
                         'package targets')
 
     repo_arg = _get_repo_options(fromrepo=fromrepo, **kwargs)

salt/modules/zypper.py

@@ -244,7 +244,7 @@ def install(name=None,
             # Allow "version" to work for single package target
             pkg_params = {name: version}
         else:
-            log.warning('"version" parameter will be ignored for muliple '
+            log.warning('"version" parameter will be ignored for multiple '
                         'package targets')
 
     if pkg_type == 'repository':

salt/output/nested.py

@@ -15,7 +15,7 @@ def __init__(self):
 
     def display(self, ret, indent, prefix, out):
         '''
-        Recursively interate down through data structures to determine output
+        Recursively iterate down through data structures to determine output
         '''
         if ret is None or ret is True or ret is False:
             out += '{0}{1}{2}{3}{4}\n'.format(

salt/output/no_return.py

@@ -12,7 +12,7 @@ def __init__(self):
 
     def display(self, ret, indent, prefix, out):
         '''
-        Recursively interate down through data structures to determine output
+        Recursively iterate down through data structures to determine output
         '''
         if isinstance(ret, str):
             lines = ret.split('\n')

salt/overstate.py

@@ -1,5 +1,5 @@
 '''
-Manage the proces of the overstate. The overstate is a means to orchistrate
+Manage the process of the overstate. The overstate is a means to orchestrate
 the deployment of states over groups of servers.
 '''
 

salt/pillar/mongo.py

@@ -40,8 +40,8 @@
 
 In the example above, we've decided to use the ``vm`` collection in the
 database to store the data. Minion ids are stored in the ``name`` field on
-documents in that collection. And, since minon ids are FQDNs in most cases,
-we'll need to trim the domain name in order to find the minon by hostname in
+documents in that collection. And, since minion ids are FQDNs in most cases,
+we'll need to trim the domain name in order to find the minion by hostname in
 the collection. When we find a minion, return only the ``customer_id``,
 ``software``, and ``apache_vhosts`` fields, as that will contain the data we
 want for a given node. They will be available directly inside the ``pillar``
@@ -89,7 +89,7 @@ def ext_pillar(pillar, collection='pillar', id_field='_id', re_pattern=None,
         * `collection`: The mongodb collection to read data from. Defaults to
           ``'pillar'``.
         * `id_field`: The field in the collection that represents an individual
-          minon id. Defaults to ``'_id'``.
+          minion id. Defaults to ``'_id'``.
         * `re_pattern`: If your naming convention in the collection is shorter
           than the minion id, you can use this to trim the name.
           `re_pattern` will be used to match the name, and `re_replace` will

salt/pillar/pillar_ldap.py

@@ -1,7 +1,7 @@
 '''
 This pillar module parses a config file (specified in the salt master config),
 and executes a series of LDAP searches based on that config.  Data returned by
-these searches is aggregrated, with data items found later in the LDAP search
+these searches is aggregated, with data items found later in the LDAP search
 order overriding data found earlier on.
 The final result set is merged with the pillar data.
 '''

salt/renderers/pydsl.py

@@ -50,7 +50,7 @@
 
 A state :term:`ID declaration` is created with a ``state(id)`` function call.
 Subsequent ``state(id)`` call with the same id returns the same object. This
-singleton access pattern applys to all declaration objects created with the DSL.
+singleton access pattern applies to all declaration objects created with the DSL.
 
 .. code-block:: python
     

salt/returners/carbon_return.py

@@ -78,7 +78,7 @@ def returner(ret):
                 val = float(val)
                 metrics.append((metric_base + '.' + _formatHostname(name) + '.' + key, val, timestamp))
             except TypeError:
-                log.info('Error in carbon returner, when trying to convert metric:{0},with val:{1}'.format(key, val))
+                log.info('Error in carbon returner, when trying to convert metric:{0}, with val:{1}'.format(key, val))
 
     def _send_textmetrics(metrics):
         ''' Use text protorocol to send metric over socket '''

salt/states/layman.py

@@ -1,5 +1,5 @@
 '''
-Mangement of Gentoo Overlays using layman
+Management of Gentoo Overlays using layman
 =========================================
 
 A state module to manage Gentoo package overlays via layman
@@ -43,7 +43,7 @@ def present(name):
         if len(changes) < 1:
             ret['comment'] = 'Overlay {0} failed to add'.format(name)
             ret['result'] = False
-        # Sucess
+        # Success
         else:
             ret['changes']['added'] = changes
             ret['comment'] = 'Overlay {0} added.'.format(name)
@@ -77,7 +77,7 @@ def absent(name):
         if len(changes) < 1:
             ret['comment'] = 'Overlay {0} failed to delete'.format(name)
             ret['result'] = False
-        # Sucess
+        # Success
         else:
             ret['changes']['deleted'] = changes
             ret['comment'] = 'Overlay {0} deleted.'.format(name)

salt/states/tomcat.py

@@ -56,7 +56,7 @@ def war_deployed(name, war, url='http://localhost:8080/manager', __env__='base',
     name
         the context path to deploy
     war
-        absolute path to war file (should be accessable by the user running
+        absolute path to war file (should be accessible by the user running
         tomcat) or a path supported by the salt.modules.cp.get_file function
     url : http://localhost:8080/manager
         the url of the server manager webapp

salt/tops/mongo.py

@@ -77,7 +77,7 @@ def top(**kwargs):
         * `collection`: The mongodb collection to read data from. Defaults to
           ``'tops'``.
         * `id_field`: The field in the collection that represents an individual
-          minon id. Defaults to ``'_id'``.
+          minion id. Defaults to ``'_id'``.
         * `re_pattern`: If your naming convention in the collection is shorter
           than the minion id, you can use this to trim the name.
           `re_pattern` will be used to match the name, and `re_replace` will

salt/utils/event.py

@@ -345,7 +345,7 @@ def list_reactors(self, tag):
         Take in the tag from an event and return a list of the reactors to
         process
         '''
-        log.debug('Gathering rections for tag {0}'.format(tag))
+        log.debug('Gathering reactors for tag {0}'.format(tag))
         reactors = []
         if isinstance(self.opts['reactor'], basestring):
             try:
@@ -499,7 +499,7 @@ def fire_master(self, data, tag):
     def fire_running(self, running):
         '''
         Pass in a state "running" dict, this is the return dict from a state
-        call. The dict will be processesd and fire events.
+        call. The dict will be processed and fire events.
 
         By default yellows and reds fire events on the master and minion, but
         this can be configured.

tests/integration/modules/file.py

@@ -30,7 +30,7 @@ def setUp(self):
         self.mybadsymlink = os.path.join(integration.TMP, 'mybadsymlink')
         if os.path.islink(self.mybadsymlink):
             os.remove(self.mybadsymlink)
-        os.symlink('/nonexistantpath', self.mybadsymlink)
+        os.symlink('/nonexistentpath', self.mybadsymlink)
         super(FileModuleTest, self).setUp()
 
     def tearDown(self):