diff --git a/.pylintrc b/.pylintrc index 828166f71a2..219a8575ecd 100644 --- a/.pylintrc +++ b/.pylintrc @@ -72,7 +72,7 @@ confidence= # can either give multiple identifiers separated by comma (,) or put this # option multiple times (only on the command line, not in the configuration # file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if +# disable everything first and then re-enable specific checks. For example, if # you want to run only the similarities checker, you can use "--disable=all # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes diff --git a/.testing.pylintrc b/.testing.pylintrc index 733fdfb0d73..9745926746a 100644 --- a/.testing.pylintrc +++ b/.testing.pylintrc @@ -69,7 +69,7 @@ confidence= # can either give multiple identifiers separated by comma (,) or put this # option multiple times (only on the command line, not in the configuration # file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if +# disable everything first and then re-enable specific checks. For example, if # you want to run only the similarities checker, you can use "--disable=all # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes diff --git a/doc/conf.py b/doc/conf.py index 3127a8675c6..9eef2d86281 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -26,7 +26,7 @@ class Mock(object): ''' def __init__(self, mapping=None, *args, **kwargs): """ - Mapping allows to bypass the Mock object, but actually assign + Mapping allows autodoc to bypass the Mock object, but actually assign a specific value, expected by a specific attribute returned. """ self.__mapping = mapping or {} diff --git a/doc/faq.rst b/doc/faq.rst index 8c6901213e7..82374178161 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -260,9 +260,9 @@ service. But restarting the service while in the middle of a state run interrupts the process of the Minion running states and sending results back to the Master. A common way to workaround that is to schedule restarting of the Minion service using :ref:`masterless mode ` after all -other states have been applied. This allows to keep Minion to Master connection -alive for the Minion to report the final results to the Master, while the -service is restarting in the background. +other states have been applied. This allows the minion to keep Minion to Master +connection alive for the Minion to report the final results to the Master, while +the service is restarting in the background. Upgrade without automatic restart ********************************* diff --git a/doc/topics/releases/2014.7.6.rst b/doc/topics/releases/2014.7.6.rst index 412c1da4cb4..0b0c091a25b 100644 --- a/doc/topics/releases/2014.7.6.rst +++ b/doc/topics/releases/2014.7.6.rst @@ -760,7 +760,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt - **PR** `#22925`_: (*rallytime*) Backport `#22895`_ to 2014.7 | refs: `#23113`_ - - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a succesfull login + - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login | refs: `#22925`_ * dfe2066 Merge pull request `#23113`_ from saltstack/revert-22925-`bp-22895`_ * b957ea8 Revert "Backport `#22895`_ to 2014.7" @@ -921,7 +921,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt | refs: `#23113`_ @ *2015-04-22T02:30:26Z* - - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a succesfull login + - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login | refs: `#22925`_ * 6890752 Merge pull request `#22925`_ from rallytime/`bp-22895`_ * 3852d96 Pylint fix @@ -930,7 +930,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt * 5ebf159 Cleaned up pull request - * a08ac47 pam_tally counter was not reset to 0 after a succesfull login + * a08ac47 pam_tally counter was not reset to 0 after a successful login - **PR** `#22914`_: (*cachedout*) Call proper returner function in jobs.list_jobs @ *2015-04-22T00:49:01Z* diff --git a/doc/topics/releases/2015.8.4.rst b/doc/topics/releases/2015.8.4.rst index 56d84195c05..2cd072ad783 100644 --- a/doc/topics/releases/2015.8.4.rst +++ b/doc/topics/releases/2015.8.4.rst @@ -403,7 +403,7 @@ Changes: - **PR** `#29708`_: (*lagesag*) Fix test=True for file.directory with recurse ignore_files/ignore_dirs. -- **PR** `#29642`_: (*cachedout*) Correctly restart deamonized minions on failure +- **PR** `#29642`_: (*cachedout*) Correctly restart daemonized minions on failure - **PR** `#29599`_: (*cachedout*) Clean up minion shutdown diff --git a/doc/topics/releases/2016.11.0.rst b/doc/topics/releases/2016.11.0.rst index 8517edc0f62..4ef527cda57 100644 --- a/doc/topics/releases/2016.11.0.rst +++ b/doc/topics/releases/2016.11.0.rst @@ -261,7 +261,7 @@ Runner Changes ``salt://_utils/``) are now able to be synced to the master, making it easier to use them in custom runners. A :py:mod:`saltutil.sync_utils ` function has been added to the - :py:mod:`saltutil runner ` to faciliate the syncing of + :py:mod:`saltutil runner ` to facilitate the syncing of utility modules to the master. Pillar Changes @@ -276,7 +276,7 @@ Pillar Changes Network Automation: NAPALM ========================== -Beginning with 2016.11.0, network automation is inclued by default in the core +Beginning with 2016.11.0, network automation is included by default in the core of Salt. It is based on a the `NAPALM `_ library and provides facilities to manage the configuration and retrieve data from network devices running widely used operating systems such: JunOS, IOS-XR, @@ -704,7 +704,7 @@ Runner Module Deprecations - The ``fileserver`` runner no longer accepts the ``outputter`` keyword argument. Users will need to specify an outputter using the ``--out`` option. -- The ``jobs`` runner no longer accepts the ``ouputter`` keyword argument. Users will need to +- The ``jobs`` runner no longer accepts the ``outputter`` keyword argument. Users will need to specify an outputter using the ``--out`` option. - ``virt`` runner module: diff --git a/doc/topics/releases/2016.11.1.rst b/doc/topics/releases/2016.11.1.rst index 8011108cdab..479b54985ba 100644 --- a/doc/topics/releases/2016.11.1.rst +++ b/doc/topics/releases/2016.11.1.rst @@ -873,7 +873,7 @@ Changes: - **PR** `#37827`_: (*silenius*) add missing chloginclass - **PR** `#37826`_: (*rallytime*) Update branch refs to more relevant branch - **PR** `#37823`_: (*rallytime*) Add "names" option to file state docs: point users to highstate doc examples - - **PR** `#37822`_: (*laleocen*) add documenation for multiline encryption using nacl + - **PR** `#37822`_: (*laleocen*) add documentation for multiline encryption using nacl | refs: `#37826`_ - **PR** `#37821`_: (*rallytime*) Clarify keystone.user_present password state docs with default behavior - **PR** `#37820`_: (*rallytime*) Add some dependency documentation to libvirt docs diff --git a/doc/topics/releases/2016.11.2.rst b/doc/topics/releases/2016.11.2.rst index a3725478586..aff3a91a8be 100644 --- a/doc/topics/releases/2016.11.2.rst +++ b/doc/topics/releases/2016.11.2.rst @@ -189,9 +189,9 @@ Changes: * fd2ee7d Add some simple unit tests for salt.config.api_config function - * 3d2fefc Make sure the pidfile and log_file values are overriden by api opts + * 3d2fefc Make sure the pidfile and log_file values are overridden by api opts - * 1f6b540 Make sure the pidfile and log_file values are overriden by api opts + * 1f6b540 Make sure the pidfile and log_file values are overridden by api opts * 04d307f salt-api no longer forces the default timeout @@ -844,7 +844,7 @@ Changes: * 68d5475 Fixing Snapper unit tests for SUBVOLUME support - * e9919a9 Removing posible double '/' from the file paths + * e9919a9 Removing possible double '/' from the file paths * 8b4f87f Updating and fixing the documentation diff --git a/doc/topics/releases/2016.11.3.rst b/doc/topics/releases/2016.11.3.rst index 2adeda6ac99..ee25da393fd 100644 --- a/doc/topics/releases/2016.11.3.rst +++ b/doc/topics/releases/2016.11.3.rst @@ -367,7 +367,7 @@ Changes: * 5244041 Merge pull request `#39221`_ from lvg01/fix-bug-39220 - * e8a41d6 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ + * e8a41d6 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ * a4b169e Fixed wrong logic, fixes `#39220`_ @@ -482,7 +482,7 @@ Changes: - **PR** `#39276`_: (*gtmanfred*) _device_mismatch_ignored will never be True @ *2017-02-09T17:05:28Z* - - **ISSUE** `#39269`_: (*alexharrington*) Remount forced with lizardfs fuse filesystem due to device missmatch + - **ISSUE** `#39269`_: (*alexharrington*) Remount forced with lizardfs fuse filesystem due to device mismatch | refs: `#39276`_ - **ISSUE** `#39106`_: (*carsten-AEI*) CVMFS fuse mount gets remounted every time | refs: `#39276`_ @@ -688,7 +688,7 @@ Changes: - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - **PR** `#39146`_: (*gtmanfred*) update vmware getting started doc - **PR** `#39145`_: (*garethgreenaway*) [2016.3] Fix when targeting via pillar with Salt syndic - - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and inteface for master, closes `#39118`_ + - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and interface for master, closes `#39118`_ - **PR** `#39116`_: (*terminalmage*) Don't abort pillar.get with merge=True if default is None - **PR** `#39077`_: (*terminalmage*) Apply fix from `#38705`_ to 2016.3 branch - **PR** `#38804`_: (*alexbleotu*) Second attempt to fix prepending of root_dir to paths @@ -717,7 +717,7 @@ Changes: * 97521b3 Second attempt to fix prepending of root_dir to paths - * 6ffeda3 Clarify ipv6 option for minion and inteface for master, closes `#39118`_ (`#39131`_) + * 6ffeda3 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_) * 646b9ea Don't abort pillar.get with merge=True if default is None (`#39116`_) @@ -978,7 +978,7 @@ Changes: - **PR** `#39039`_: (*rallytime*) Update 2016.11.2 release notes -* a7fc02e Ungate the status.py module and raise unsupported errors in functions not executeable on Windows. (`#39005`_) +* a7fc02e Ungate the status.py module and raise unsupported errors in functions not executable on Windows. (`#39005`_) - **PR** `#39005`_: (*cro*) Ungate the status.py module and raise unsupported errors in functions not executable on Windows. | refs: `#39536`_ @@ -1214,7 +1214,7 @@ Changes: | refs: `#38875`_ - **PR** `#38890`_: (*cro*) Backport `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver - **PR** `#38883`_: (*techhat*) Don't require text_out path to exist - - **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistant + - **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistent - **PR** `#38867`_: (*mchugh19*) Touch deploy.sh before use | refs: `#38883`_ - **PR** `#38851`_: (*terminalmage*) Support docker-py 2.0 in dockerng @@ -1237,7 +1237,7 @@ Changes: * fbc4d2a reactor: ensure glob_ref is a string - * 2e443d7 cp.cache_file: add note re: return for nonexistant salt:// path + * 2e443d7 cp.cache_file: add note re: return for nonexistent salt:// path * e9ebec4 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163 diff --git a/doc/topics/releases/2016.11.4.rst b/doc/topics/releases/2016.11.4.rst index 6838f682991..6a3411994f9 100644 --- a/doc/topics/releases/2016.11.4.rst +++ b/doc/topics/releases/2016.11.4.rst @@ -832,7 +832,7 @@ Changes: * 2febd05 Merge pull request `#40372`_ from zer0def/pip-cache-fixes * d68067f Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes - * 4f23a23 Fixed the `test_install_download_cache_argument_in_resulting_command` to accomodate introduced cache directory argument fixes and renamed it to `test_install_download_cache_dir_arguments_in_resulting_command`. + * 4f23a23 Fixed the `test_install_download_cache_argument_in_resulting_command` to accommodate introduced cache directory argument fixes and renamed it to `test_install_download_cache_dir_arguments_in_resulting_command`. * 9d0f94e Fixed unnecessary API changes introduced with suggested changes. @@ -1345,7 +1345,7 @@ Changes: @ *2017-03-17T15:17:08Z* - **PR** `#40090`_: (*rallytime*) Back-port `#40056`_ to 2016.3 - - **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistant user + - **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistent user - **PR** `#40057`_: (*cachedout*) More mentionbot blacklists - **PR** `#40056`_: (*thatch45*) update mention bot blacklist | refs: `#40090`_ @@ -1354,7 +1354,7 @@ Changes: * 116201f Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistant user + * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistent user * a01b52b Merge pull request `#40090`_ from rallytime/`bp-40056`_ @@ -1386,7 +1386,7 @@ Changes: - **PR** `#40053`_: (*gtmanfred*) Update rh_ip.py - **PR** `#40041`_: (*terminalmage*) Fix transposed lines in salt.utils.process - **PR** `#40038`_: (*velom*) correctly parse "pkg_name===version" from pip freeze - - **PR** `#40018`_: (*meaksh*) Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call + - **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call | refs: `#40072`_ * b12720a Merge pull request `#40088`_ from rallytime/merge-2016.11 * 626bd03 Merge branch '2016.3' into '2016.11' @@ -1397,9 +1397,9 @@ Changes: * 8dcffc7 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner - * 9f5c3b7 Allows to set custom timeouts for 'manage.up' and 'manage.status' + * 9f5c3b7 Allow setting custom timeouts for 'manage.up' and 'manage.status' - * 2102d9c Allows to set 'timeout' and 'gather_job_timeout' via kwargs + * 2102d9c Allow setting 'timeout' and 'gather_job_timeout' via kwargs * 22fc529 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing @@ -1419,15 +1419,15 @@ Changes: * 703ab23 Merge pull request `#40055`_ from rallytime/doc-build-warnings * 72d16c9 Update "yaml" code-block references with "jinja" where needed -- **PR** `#40072`_: (*meaksh*) [2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call +- **PR** `#40072`_: (*meaksh*) [2016.11] Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call @ *2017-03-16T15:31:46Z* - - **PR** `#40018`_: (*meaksh*) Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call + - **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call | refs: `#40072`_ * e73a1d0 Merge pull request `#40072`_ from meaksh/2016.11-handling-timeouts-for-manage.up-runner - * 40246d3 Allows to set custom timeouts for 'manage.up' and 'manage.status' + * 40246d3 Allow setting custom timeouts for 'manage.up' and 'manage.status' - * ad232fd Allows to set 'timeout' and 'gather_job_timeout' via kwargs + * ad232fd Allow setting 'timeout' and 'gather_job_timeout' via kwargs - **PR** `#40045`_: (*terminalmage*) Fix error when chhome is invoked by user.present state in Windows @ *2017-03-15T19:00:41Z* @@ -1458,7 +1458,7 @@ Changes: - **PR** `#40016`_: (*terminalmage*) Attempt to fix failing grains tests in 2016.3 - **PR** `#39994`_: (*rallytime*) Add a versionadded tag for dockerng ulimits addition - **PR** `#39988`_: (*terminalmage*) Add comment explaining change from `#39973`_ - - **PR** `#39980`_: (*vutny*) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function + - **PR** `#39980`_: (*vutny*) [2016.3] Allow using `bg` kwarg for `cmd.run` state function - **PR** `#39973`_: (*terminalmage*) Don't use docker.Client instance from context if missing attributes * 277bd17 Merge pull request `#40025`_ from rallytime/merge-2016.11 * 029f28b Merge branch '2016.3' into '2016.11' @@ -1475,7 +1475,7 @@ Changes: * 0c61d06 Merge pull request `#39980`_ from vutny/cmd-run-state-bg - * a81dc9d [2016.3] Allow to use `bg` kwarg for `cmd.run` state function + * a81dc9d [2016.3] Allow using `bg` kwarg for `cmd.run` state function * b042484 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version @@ -1834,7 +1834,7 @@ Changes: * 9f70ad7 Merge pull request `#39472`_ from whiteinge/_reformat_low-update * d11f538 Add RunnerClient test for old/new-style arg/kwarg parsing - * ec377ab Reenable skipped RunnerClient tests + * ec377ab Re-enable skipped RunnerClient tests * 27f7fd9 Update _reformat_low to run arg through parse_input @@ -2022,13 +2022,13 @@ Changes: * e63cbba Merge pull request `#39653`_ from cachedout/26_odict * 91eb721 Use salt's ordereddict for comparison -- **PR** `#39609`_: (*gtmanfred*) intialize the Client stuff in FSClient +- **PR** `#39609`_: (*gtmanfred*) initialize the Client stuff in FSClient @ *2017-02-24T18:50:55Z* - **ISSUE** `#38836`_: (*toanctruong*) file.managed with S3 Source errors out with obscure message | refs: `#39589`_ `#39609`_ * 0bc6027 Merge pull request `#39609`_ from gtmanfred/2016.11 - * 0820620 intialize the Client stuff in FSClient + * 0820620 initialize the Client stuff in FSClient - **PR** `#39615`_: (*skizunov*) Bonjour/Avahi beacons: Make sure TXT record length is valid @ *2017-02-24T18:47:05Z* diff --git a/doc/topics/releases/2016.3.0.rst b/doc/topics/releases/2016.3.0.rst index 240e67f2332..48553d92eb0 100644 --- a/doc/topics/releases/2016.3.0.rst +++ b/doc/topics/releases/2016.3.0.rst @@ -30,7 +30,7 @@ Backwards-incompatible Changes It has been moved one directory down, into the master cachedir. On most platforms, this is ``/var/cache/salt/master/extmods``. Most users won't have to worry about this, but those who have been manually placing custom runners - into ``/var/cache/salt/extmods/runners``, or ouputters into + into ``/var/cache/salt/extmods/runners``, or outputters into ``/var/cache/salt/extmods/output``, etc. will be affected by this. To transition, it is recommended not to simply move the extmods directory into ``/var/cache/salt/master``, but to copy the custom modules into the salt diff --git a/doc/topics/releases/2016.3.5.rst b/doc/topics/releases/2016.3.5.rst index 236ef0bee86..d77a3a65e1f 100644 --- a/doc/topics/releases/2016.3.5.rst +++ b/doc/topics/releases/2016.3.5.rst @@ -149,9 +149,9 @@ Changes: * fd2ee7d Add some simple unit tests for salt.config.api_config function - * 3d2fefc Make sure the pidfile and log_file values are overriden by api opts + * 3d2fefc Make sure the pidfile and log_file values are overridden by api opts - * 1f6b540 Make sure the pidfile and log_file values are overriden by api opts + * 1f6b540 Make sure the pidfile and log_file values are overridden by api opts * 04d307f salt-api no longer forces the default timeout @@ -1046,7 +1046,7 @@ Changes: * 0e74bad Update branch refs to more relevant branch (`#37826`_) - **PR** `#37826`_: (*rallytime*) Update branch refs to more relevant branch - - **PR** `#37822`_: (*laleocen*) add documenation for multiline encryption using nacl + - **PR** `#37822`_: (*laleocen*) add documentation for multiline encryption using nacl | refs: `#37826`_ * 6a9b49c Add "names" option to file state docs: point users to highstate doc examples (`#37823`_) diff --git a/doc/topics/releases/2016.3.6.rst b/doc/topics/releases/2016.3.6.rst index 838f0375d77..5e74300126b 100644 --- a/doc/topics/releases/2016.3.6.rst +++ b/doc/topics/releases/2016.3.6.rst @@ -127,11 +127,11 @@ Changes: * 35ddb79 Merge pull request `#40141`_ from bobrik/fallback-resolve * af1545d Use the first address if cannot connect to any -- **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistant user +- **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistent user @ *2017-03-16T20:46:43Z* * 116201f Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistant user + * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistent user - **PR** `#40090`_: (*rallytime*) Back-port `#40056`_ to 2016.3 @ *2017-03-16T19:42:58Z* @@ -153,13 +153,13 @@ Changes: * d36bdb1 Merge pull request `#40070`_ from Ch3LL/2016.3.6_release * a1f8b49 update 2016.3.6 release notes with additional PR's -- **PR** `#40018`_: (*meaksh*) Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call +- **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call @ *2017-03-15T19:43:01Z* * 8dcffc7 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner - * 9f5c3b7 Allows to set custom timeouts for 'manage.up' and 'manage.status' + * 9f5c3b7 Allow setting custom timeouts for 'manage.up' and 'manage.status' - * 2102d9c Allows to set 'timeout' and 'gather_job_timeout' via kwargs + * 2102d9c Allow setting 'timeout' and 'gather_job_timeout' via kwargs - **PR** `#40038`_: (*velom*) correctly parse "pkg_name===version" from pip freeze @ *2017-03-15T19:30:03Z* @@ -197,11 +197,11 @@ Changes: * 5d84b40 Attempt to fix failing grains tests in 2016.3 -- **PR** `#39980`_: (*vutny*) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function +- **PR** `#39980`_: (*vutny*) [2016.3] Allow using `bg` kwarg for `cmd.run` state function @ *2017-03-14T17:16:14Z* * 0c61d06 Merge pull request `#39980`_ from vutny/cmd-run-state-bg - * a81dc9d [2016.3] Allow to use `bg` kwarg for `cmd.run` state function + * a81dc9d [2016.3] Allow using `bg` kwarg for `cmd.run` state function - **PR** `#39994`_: (*rallytime*) Add a versionadded tag for dockerng ulimits addition @ *2017-03-13T20:58:02Z* @@ -658,7 +658,7 @@ Changes: - **ISSUE** `#39220`_: (*lvg01*) state file.line skips leading spaces in content with mode:ensure and indent:False | refs: `#39221`_ `#39221`_ `#39221`_ `#39221`_ * 5244041 Merge pull request `#39221`_ from lvg01/fix-bug-39220 - * e8a41d6 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ + * e8a41d6 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ * a4b169e Fixed wrong logic, fixes `#39220`_ @@ -807,11 +807,11 @@ Changes: * 97521b3 Second attempt to fix prepending of root_dir to paths -* 6ffeda3 Clarify ipv6 option for minion and inteface for master, closes `#39118`_ (`#39131`_) +* 6ffeda3 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_) - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented | refs: `#39289`_ - - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and inteface for master, closes `#39118`_ + - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and interface for master, closes `#39118`_ * 646b9ea Don't abort pillar.get with merge=True if default is None (`#39116`_) @@ -1013,7 +1013,7 @@ Changes: * e40fac5 Catch MinionError in file.source_list -- **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistant +- **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistent @ *2017-01-24T15:23:39Z* - **ISSUE** `#36121`_: (*Ashald*) TemplateNotFound/Unable to cache file @@ -1021,7 +1021,7 @@ Changes: * b5df104 Merge pull request `#38875`_ from terminalmage/issue36121 * fbc4d2a reactor: ensure glob_ref is a string - * 2e443d7 cp.cache_file: add note re: return for nonexistant salt:// path + * 2e443d7 cp.cache_file: add note re: return for nonexistent salt:// path - **PR** `#38890`_: (*cro*) Backport `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver @ *2017-01-24T15:15:35Z* diff --git a/doc/topics/sdb/index.rst b/doc/topics/sdb/index.rst index df16d57802a..cb8af7d8b40 100644 --- a/doc/topics/sdb/index.rst +++ b/doc/topics/sdb/index.rst @@ -96,7 +96,7 @@ a new value using a command like: Deleting values (if supported by the driver) is done pretty much the same way as getting them. Provided that you have a profile called ``mykvstore`` that uses -a driver allowing to delete values you would delete a value as shown bellow: +a driver allowing to delete values you would delete a value as shown below: .. code-block:: bash diff --git a/doc/topics/transports/tcp.rst b/doc/topics/transports/tcp.rst index d12bde129e4..b4bf3e6f80e 100644 --- a/doc/topics/transports/tcp.rst +++ b/doc/topics/transports/tcp.rst @@ -66,7 +66,7 @@ Specific options can be sent to the minion also, as defined in the Python .. note:: - While setting the ssl_version is not required, we recomend it. Some older + While setting the ssl_version is not required, we recommend it. Some older versions of python do not support the latest TLS protocol and if this is the case for your version of python we strongly recommend upgrading your version of Python. diff --git a/pkg/suse/salt.changes b/pkg/suse/salt.changes index 874c78d5b4d..7e6ac7ee29d 100644 --- a/pkg/suse/salt.changes +++ b/pkg/suse/salt.changes @@ -130,7 +130,7 @@ Wed Oct 7 19:15:54 UTC 2015 - mrueckert@suse.de 2. the only part of the package which would really benefit from it would be the doc package. but given we only install the files via %doc, we can not use it for that either. -- reenable completions on distros newer than sle11 +- re-enable completions on distros newer than sle11 - do not use _datarootdir, use _datadir instead. ------------------------------------------------------------------- diff --git a/salt/beacons/avahi_announce.py b/salt/beacons/avahi_announce.py index 117e1ddd239..a8173758f92 100644 --- a/salt/beacons/avahi_announce.py +++ b/salt/beacons/avahi_announce.py @@ -91,7 +91,7 @@ def beacon(config): ''' Broadcast values via zeroconf - If the announced values are static, it is adviced to set run_once: True + If the announced values are static, it is advised to set run_once: True (do not poll) on the beacon configuration. The following are required configuration settings: diff --git a/salt/beacons/bonjour_announce.py b/salt/beacons/bonjour_announce.py index 0af29289281..865fb035fa0 100644 --- a/salt/beacons/bonjour_announce.py +++ b/salt/beacons/bonjour_announce.py @@ -84,7 +84,7 @@ def beacon(config): ''' Broadcast values via zeroconf - If the announced values are static, it is adviced to set run_once: True + If the announced values are static, it is advised to set run_once: True (do not poll) on the beacon configuration. The following are required configuration settings: diff --git a/salt/client/mixins.py b/salt/client/mixins.py index c703c166014..634133c3523 100644 --- a/salt/client/mixins.py +++ b/salt/client/mixins.py @@ -543,7 +543,7 @@ class AsyncClientMixin(object): # if this is a ret, we have our own set of rules if suffix == 'ret': - # Check if ouputter was passed in the return data. If this is the case, + # Check if outputter was passed in the return data. If this is the case, # then the return data will be a dict two keys: 'data' and 'outputter' if isinstance(event.get('return'), dict) \ and set(event['return']) == set(('data', 'outputter')): diff --git a/salt/cloud/clouds/vmware.py b/salt/cloud/clouds/vmware.py index 839e2562f2e..fc7e19bd21c 100644 --- a/salt/cloud/clouds/vmware.py +++ b/salt/cloud/clouds/vmware.py @@ -2670,7 +2670,7 @@ def create(vm_): log.info("Creating {0} from {1}({2})".format(vm_['name'], clone_type, vm_['clonefrom'])) if datastore and not datastore_ref and datastore_cluster_ref: - # datastore cluster has been specified so apply Storage DRS recomendations + # datastore cluster has been specified so apply Storage DRS recommendations pod_spec = vim.storageDrs.PodSelectionSpec(storagePod=datastore_cluster_ref) storage_spec = vim.storageDrs.StoragePlacementSpec( diff --git a/salt/cloud/deploy/bootstrap-salt.sh b/salt/cloud/deploy/bootstrap-salt.sh index cc1c4ffb8ef..308337bd365 100755 --- a/salt/cloud/deploy/bootstrap-salt.sh +++ b/salt/cloud/deploy/bootstrap-salt.sh @@ -95,7 +95,7 @@ echoinfo() { #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: echowarn -# DESCRIPTION: Echo warning informations to stdout. +# DESCRIPTION: Echo warning information to stdout. #---------------------------------------------------------------------------------------------------------------------- echowarn() { printf "${YC} * WARN${EC}: %s\n" "$@"; @@ -304,7 +304,7 @@ __usage() { -U If set, fully upgrade the system prior to bootstrapping Salt -I If set, allow insecure connections while downloading any files. For example, pass '--no-check-certificate' to 'wget' or '--insecure' to - 'curl'. On Debian and Ubuntu, using this option with -U allows to obtain + 'curl'. On Debian and Ubuntu, using this option with -U allows obtaining GnuPG archive keys insecurely if distro has changed release signatures. -F Allow copied files to overwrite existing (config, init.d, etc) -K If set, keep the temporary files in the temporary directories specified @@ -1685,7 +1685,7 @@ __git_clone_and_checkout() { __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 7 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" diff --git a/salt/config/__init__.py b/salt/config/__init__.py index d5b12f21432..30b2abcce9b 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -1923,7 +1923,7 @@ def prepend_root_dir(opts, path_options): # Remove relative root dir so we can add the absolute root dir path = path[len(root_opt):] elif os.path.isabs(path_option): - # Absolute path (not default or overriden root_dir) + # Absolute path (not default or overridden root_dir) # No prepending required continue # Prepending the root dir @@ -2275,7 +2275,7 @@ def cloud_config(path, env_var='SALT_CLOUD_CONFIG', defaults=None, elif master_config_path is not None and master_config is None: master_config = salt.config.master_config(master_config_path) - # cloud config has a seperate cachedir + # cloud config has a separate cachedir del master_config['cachedir'] # 2nd - salt-cloud configuration which was loaded before so we could diff --git a/salt/daemons/flo/worker.py b/salt/daemons/flo/worker.py index 07e1f3373ae..75cada99d7f 100644 --- a/salt/daemons/flo/worker.py +++ b/salt/daemons/flo/worker.py @@ -64,7 +64,7 @@ def worker_fork(self): class Worker(multiprocessing.Process): ''' - Create an ioflo worker in a seperate process + Create an ioflo worker in a separate process ''' def __init__(self, opts, windex, worker_verify, access_keys, mkey, aes): super(Worker, self).__init__() diff --git a/salt/modules/acme.py b/salt/modules/acme.py index ca655ede84f..6b63c7664cc 100644 --- a/salt/modules/acme.py +++ b/salt/modules/acme.py @@ -273,7 +273,7 @@ def renew_by(name, window=None): def needs_renewal(name, window=None): ''' - Check if a certicate needs renewal + Check if a certificate needs renewal :param name: CommonName of cert :param window: Window in days to renew earlier or True/force to just return True diff --git a/salt/modules/archive.py b/salt/modules/archive.py index 68d8989a688..bd439bd1a7b 100644 --- a/salt/modules/archive.py +++ b/salt/modules/archive.py @@ -948,7 +948,7 @@ def unzip(zip_file, extract_perms : True The Python zipfile_ module does not extract file/directory attributes by default. When this argument is set to ``True``, Salt will attempt to - apply the file permision attributes to the extracted files/folders. + apply the file permission attributes to the extracted files/folders. On Windows, only the read-only flag will be extracted as set within the zip file, other attributes (i.e. user/group permissions) are ignored. diff --git a/salt/modules/boto_secgroup.py b/salt/modules/boto_secgroup.py index eefefbfc65c..118596f1d89 100644 --- a/salt/modules/boto_secgroup.py +++ b/salt/modules/boto_secgroup.py @@ -609,7 +609,7 @@ def set_tags(tags, a dict of key:value pair of tags to set on the security group name - the name of the security gruop + the name of the security group group_id the group id of the security group (in lie of a name/vpc combo) diff --git a/salt/modules/ceph.py b/salt/modules/ceph.py index 68921034be4..797728041ae 100644 --- a/salt/modules/ceph.py +++ b/salt/modules/ceph.py @@ -143,7 +143,7 @@ def osd_prepare(**kwargs): Notes: cluster_uuid - Set the deivce to store the osd data on. + Set the device to store the osd data on. journal_dev Set the journal device. defaults to osd_dev. @@ -194,7 +194,7 @@ def keyring_create(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -223,7 +223,7 @@ def keyring_save(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -251,7 +251,7 @@ def keyring_purge(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -281,7 +281,7 @@ def keyring_present(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -309,7 +309,7 @@ def keyring_auth_add(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -337,7 +337,7 @@ def keyring_auth_del(**kwargs): Notes: keyring_type - Required paramter + Required parameter Can be set to: admin, mon, osd, rgw, mds @@ -374,7 +374,7 @@ def mon_is(**kwargs): def mon_status(**kwargs): ''' - Get status from mon deamon + Get status from mon daemon CLI Example: @@ -396,7 +396,7 @@ def mon_status(**kwargs): def mon_quorum(**kwargs): ''' - Is mon deamon in quorum + Is mon daemon in quorum CLI Example: @@ -418,7 +418,7 @@ def mon_quorum(**kwargs): def mon_active(**kwargs): ''' - Is mon deamon running + Is mon daemon running CLI Example: @@ -518,7 +518,7 @@ def rgw_create(**kwargs): Notes: name: - Required paramter + Required parameter Set the rgw client name. Must start with 'rgw.' cluster_uuid @@ -546,7 +546,7 @@ def rgw_destroy(**kwargs): Notes: name: - Required paramter + Required parameter Set the rgw client name. Must start with 'rgw.' cluster_uuid @@ -576,15 +576,15 @@ def mds_create(**kwargs): Notes: name: - Required paramter + Required parameter Set the rgw client name. Must start with 'mds.' port: - Required paramter + Required parameter Port for the mds to listen to. addr: - Required paramter + Required parameter Address or IP address for the mds to listen to. cluster_uuid @@ -612,7 +612,7 @@ def mds_destroy(**kwargs): Notes: name: - Required paramter + Required parameter Set the rgw client name. Must start with 'mds.' cluster_uuid diff --git a/salt/modules/cisconso.py b/salt/modules/cisconso.py index 0572e1e8472..1f8d50bdccd 100644 --- a/salt/modules/cisconso.py +++ b/salt/modules/cisconso.py @@ -43,7 +43,7 @@ def get_data(datastore, path): :type datastore: :class:`DatastoreType` (``str`` enum). :param path: The device path to set the value at, - a list of element names in order, / seperated + a list of element names in order, / separated :type path: ``list``, ``str`` OR ``tuple`` :return: The network configuration at that tree @@ -67,7 +67,7 @@ def set_data_value(datastore, path, data): :type datastore: :class:`DatastoreType` (``str`` enum). :param path: The device path to set the value at, - a list of element names in order, / seperated + a list of element names in order, / separated :type path: ``list``, ``str`` OR ``tuple`` :param data: The new value at the given path diff --git a/salt/modules/cmdmod.py b/salt/modules/cmdmod.py index e2443d39bbf..8985b96611f 100644 --- a/salt/modules/cmdmod.py +++ b/salt/modules/cmdmod.py @@ -2667,7 +2667,7 @@ def shell_info(shell, list_modules=False): .. versionadded:: 2016.11.0 Provides information about a shell or script languages which often use - ``#!``. The values returned are dependant on the shell or scripting + ``#!``. The values returned are dependent on the shell or scripting languages all return the ``installed``, ``path``, ``version``, ``version_raw`` diff --git a/salt/modules/debian_ip.py b/salt/modules/debian_ip.py index b4619bb1865..025fe2d4d76 100644 --- a/salt/modules/debian_ip.py +++ b/salt/modules/debian_ip.py @@ -1581,13 +1581,13 @@ def _write_file_ifaces(iface, data, **settings): if adapter == iface: saved_ifcfg = tmp - _SEPERATE_FILE = False + _SEPARATE_FILE = False if 'filename' in settings: if not settings['filename'].startswith('/'): filename = '{0}/{1}'.format(_DEB_NETWORK_DIR, settings['filename']) else: filename = settings['filename'] - _SEPERATE_FILE = True + _SEPARATE_FILE = True else: if 'filename' in adapters[adapter]['data']: filename = adapters[adapter]['data'] @@ -1600,7 +1600,7 @@ def _write_file_ifaces(iface, data, **settings): log.error(msg) raise AttributeError(msg) with salt.utils.flopen(filename, 'w') as fout: - if _SEPERATE_FILE: + if _SEPARATE_FILE: fout.write(saved_ifcfg) else: fout.write(ifcfg) diff --git a/salt/modules/file.py b/salt/modules/file.py index 23cb32ce497..bd1ccd921c9 100644 --- a/salt/modules/file.py +++ b/salt/modules/file.py @@ -594,7 +594,7 @@ def get_source_sum(file_name='', file, used to disambiguate ambiguous matches. saltenv : base - Salt fileserver environment from which to retrive the source_hash. This + Salt fileserver environment from which to retrieve the source_hash. This value will only be used when ``source_hash`` refers to a file on the Salt fileserver (i.e. one beginning with ``salt://``). @@ -4607,7 +4607,7 @@ def manage_file(name, .. note:: keep_mode does not work with salt-ssh. - As a consequence of how the files are transfered to the minion, and + As a consequence of how the files are transferred to the minion, and the inability to connect back to the master with salt-ssh, salt is unable to stat the file as it exists on the fileserver and thus cannot mirror the mode on the salt-ssh minion diff --git a/salt/modules/junos.py b/salt/modules/junos.py index 225b5735ca5..7b7cc1a6d3c 100644 --- a/salt/modules/junos.py +++ b/salt/modules/junos.py @@ -114,7 +114,7 @@ def rpc(cmd=None, dest=None, format='xml', *args, **kwargs): Options: * cmd: the rpc to be executed - * dest: destination file where the rpc ouput is dumped + * dest: destination file where the rpc output is dumped * format: the format in which the rpc reply must be stored in file specified in the dest (used only when dest is specified) * args: other arguments as taken by rpc call of PyEZ * kwargs: keyworded arguments taken by rpc call of PyEZ @@ -382,7 +382,7 @@ def install_config(path=None, **kwargs): Options: * path: Path where the configuration file is present. - * kwargs: keyworded arguments taken by load fucntion of PyEZ + * kwargs: keyworded arguments taken by load function of PyEZ ''' conn = __proxy__['junos.conn']() ret = dict() diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py index 94253bba3ac..503a0c49ddd 100644 --- a/salt/modules/lxc.py +++ b/salt/modules/lxc.py @@ -490,7 +490,7 @@ def cloud_init_interface(name, vm_=None, **kwargs): # via the legacy salt cloud configuration style. # On other cases, we should rely on settings provided by the new # salt lxc network profile style configuration which can - # be also be overriden or a per interface basis via the nic_opts dict. + # be also be overridden or a per interface basis via the nic_opts dict. if bridge: eth0['link'] = bridge if gateway: diff --git a/salt/modules/napalm_network.py b/salt/modules/napalm_network.py index 2a464c45fee..c69bfbaa8a0 100644 --- a/salt/modules/napalm_network.py +++ b/salt/modules/napalm_network.py @@ -538,7 +538,7 @@ def ipaddrs(): Returns all configured IP addresses on all interfaces as a dictionary of dictionaries.\ Keys of the main dictionary represent the name of the interface.\ Values of the main dictionary represent are dictionaries that may consist of two keys\ - 'ipv4' and 'ipv6' (one, both or none) which are themselvs dictionaries witht the IP addresses as keys.\ + 'ipv4' and 'ipv6' (one, both or none) which are themselvs dictionaries with the IP addresses as keys.\ CLI Example: @@ -782,7 +782,7 @@ def load_config(filename=None, To avoid committing the configuration, set the argument ``test`` to ``True`` and will discard (dry run). - To keep the chnages but not commit, set ``commit`` to ``False``. + To keep the changes but not commit, set ``commit`` to ``False``. To replace the config, set ``replace`` to ``True``. @@ -800,7 +800,7 @@ def load_config(filename=None, Commit? Default: ``True``. debug: False - Debug mode. Will insert a new key under the output dictionary, as ``loaded_config`` contaning the raw + Debug mode. Will insert a new key under the output dictionary, as ``loaded_config`` containing the raw configuration loaded on the device. .. versionadded:: 2016.11.2 @@ -889,7 +889,7 @@ def load_template(template_name, To avoid committing the configuration, set the argument ``test`` to ``True`` and will discard (dry run). - To preserve the chnages, set ``commit`` to ``False``. + To preserve the changes, set ``commit`` to ``False``. However, this is recommended to be used only in exceptional cases when there are applied few consecutive states and/or configuration changes. @@ -913,7 +913,7 @@ def load_template(template_name, Placing the template under ``/etc/salt/states/templates/example.jinja``, it can be used as ``salt://templates/example.jinja``. - Alternatively, for local files, the user can specify the abolute path. + Alternatively, for local files, the user can specify the absolute path. If remotely, the source can be retrieved via ``http``, ``https`` or ``ftp``. Examples: @@ -995,7 +995,7 @@ def load_template(template_name, debug: False Debug mode. Will insert a new key under the output dictionary, - as ``loaded_config`` contaning the raw result after the template was rendered. + as ``loaded_config`` containing the raw result after the template was rendered. .. versionadded:: 2016.11.2 @@ -1014,7 +1014,7 @@ def load_template(template_name, .. note:: - Do not explicitely specify this argument. + Do not explicitly specify this argument. This represents any other variable that will be sent to the template rendering system. Please see the examples below! @@ -1153,7 +1153,7 @@ def load_template(template_name, if template_path and not file_exists: template_name = __salt__['file.join'](template_path, template_name) if not saltenv: - # no saltenv overriden + # no saltenv overridden # use the custom template path saltenv = template_path if not salt_render else 'base' elif salt_render and not saltenv: @@ -1344,8 +1344,8 @@ def config_control(): If differences found, will try to commit. In case commit unsuccessful, will try to rollback. - :return: A tuple with a boolean that specifies if the config was changed/commited/rollbacked on the device.\ - And a string that provides more details of the reason why the configuration was not commited properly. + :return: A tuple with a boolean that specifies if the config was changed/committed/rollbacked on the device.\ + And a string that provides more details of the reason why the configuration was not committed properly. CLI Example: diff --git a/salt/modules/napalm_ntp.py b/salt/modules/napalm_ntp.py index 1d56f1adc8c..0df7206ed19 100644 --- a/salt/modules/napalm_ntp.py +++ b/salt/modules/napalm_ntp.py @@ -220,7 +220,7 @@ def set_peers(*peers, **options): :commit commit (bool): commit loaded config. By default `commit` is True (will commit the changes). Useful when the user does not want to commit after each change, but after a couple. - By default this function will commit the config changes (if any). To load without commiting, use the `commit` + By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. CLI Example: @@ -251,7 +251,7 @@ def set_servers(*servers, **options): :commit commit (bool): commit loaded config. By default `commit` is True (will commit the changes). Useful when the user does not want to commit after each change, but after a couple. - By default this function will commit the config changes (if any). To load without commiting, use the `commit` + By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. CLI Example: @@ -282,7 +282,7 @@ def delete_peers(*peers, **options): :commit commit (bool): commit loaded config. By default `commit` is True (will commit the changes). Useful when the user does not want to commit after each change, but after a couple. - By default this function will commit the config changes (if any). To load without commiting, use the `commit` + By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. CLI Example: @@ -313,7 +313,7 @@ def delete_servers(*servers, **options): :commit commit (bool): commit loaded config. By default `commit` is True (will commit the changes). Useful when the user does not want to commit after each change, but after a couple. - By default this function will commit the config changes (if any). To load without commiting, use the `commit` + By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. CLI Example: diff --git a/salt/modules/parallels.py b/salt/modules/parallels.py index 6bca7ba5b5c..c72b61ceefe 100644 --- a/salt/modules/parallels.py +++ b/salt/modules/parallels.py @@ -7,7 +7,7 @@ see the `Parallels Desktop Reference Guide `_. What has not been implemented yet can be accessed through ``parallels.prlctl`` -and ``parallels.prlsrvctl`` (note the preceeding double dash ``--`` as +and ``parallels.prlsrvctl`` (note the preceding double dash ``--`` as necessary): .. code-block:: diff --git a/salt/modules/ps.py b/salt/modules/ps.py index 1a4a7afa530..48087b11fc8 100644 --- a/salt/modules/ps.py +++ b/salt/modules/ps.py @@ -640,7 +640,7 @@ def get_users(): def lsof(name): ''' - Retrieve the lsof informations of the given process name. + Retrieve the lsof information of the given process name. CLI Example: @@ -657,7 +657,7 @@ def lsof(name): def netstat(name): ''' - Retrieve the netstat informations of the given process name. + Retrieve the netstat information of the given process name. CLI Example: diff --git a/salt/modules/reg.py b/salt/modules/reg.py index e72f92795f1..ebc22a8d406 100644 --- a/salt/modules/reg.py +++ b/salt/modules/reg.py @@ -478,9 +478,9 @@ def set_value(hive, under the key. If not passed, the key (Default) value will be set. :param object vdata: The value data to be set. - What the type of this paramater + What the type of this parameter should be is determined by the value of the vtype - paramater. The correspondence + parameter. The correspondence is as follows: .. glossary:: @@ -497,15 +497,15 @@ def set_value(hive, str :param str vtype: The value type. - The possible values of the vtype paramater are indicated - above in the description of the vdata paramater. + The possible values of the vtype parameter are indicated + above in the description of the vdata parameter. :param bool use_32bit_registry: Sets the 32bit portion of the registry on 64bit installations. On 32bit machines this is ignored. - :param bool volatile: When this paramater has a value of True, the registry key will be + :param bool volatile: When this parameter has a value of True, the registry key will be made volatile (i.e. it will not persist beyond a system reset or shutdown). - This paramater only has an effect when a key is being created and at no + This parameter only has an effect when a key is being created and at no other time. :return: Returns True if successful, False if not diff --git a/salt/modules/runit.py b/salt/modules/runit.py index 3529fc11f1f..3a24801c8f3 100644 --- a/salt/modules/runit.py +++ b/salt/modules/runit.py @@ -647,7 +647,7 @@ def enable(name, start=False, **kwargs): def disable(name, stop=False, **kwargs): ''' Don't start service ``name`` at boot - Returns ``True`` if operation is successfull + Returns ``True`` if operation is successful name the service's name @@ -686,7 +686,7 @@ def disable(name, stop=False, **kwargs): def remove(name): ''' Remove the service from system. - Returns ``True`` if operation is successfull. + Returns ``True`` if operation is successful. The service will be also stopped. name diff --git a/salt/modules/slack_notify.py b/salt/modules/slack_notify.py index 59df51ed362..db819b22841 100644 --- a/salt/modules/slack_notify.py +++ b/salt/modules/slack_notify.py @@ -247,7 +247,7 @@ def call_hook(message, username=None, icon_emoji=None): ''' - Send message to Slack incomming webhook. + Send message to Slack incoming webhook. :param message: The topic of message. :param attachment: The message to send to the Slacke WebHook. @@ -258,7 +258,7 @@ def call_hook(message, :param channel: The channel to use instead of the WebHook default. :param username: Username to use instead of WebHook default. :param icon_emoji: Icon to use instead of WebHook default. - :return: Boolean if message was sent successfuly. + :return: Boolean if message was sent successfully. CLI Example: diff --git a/salt/modules/snapper.py b/salt/modules/snapper.py index d5f1181743f..bb5ee3e63bf 100644 --- a/salt/modules/snapper.py +++ b/salt/modules/snapper.py @@ -491,7 +491,7 @@ def modify_snapshot(snapshot_id=None, snapshot = get_snapshot(config=config, number=snapshot_id) try: - # Updating only the explicitely provided attributes by the user + # Updating only the explicitly provided attributes by the user updated_opts = { 'description': description if description is not None else snapshot['description'], 'cleanup': cleanup if cleanup is not None else snapshot['cleanup'], @@ -669,7 +669,7 @@ def undo(config='root', files=None, num_pre=None, num_post=None): the files into the state of num_pre. .. warning:: - If one of the files has changes after num_post, they will be overwriten + If one of the files has changes after num_post, they will be overwritten The snapshots are used to determine the file list, but the current version of the files will be overwritten by the versions in num_pre. @@ -790,7 +790,7 @@ def diff(config='root', filename=None, num_pre=None, num_post=None): if filepath.startswith(SUBVOLUME): _filepath = filepath[len(SUBVOLUME):] - # Just in case, removing posible double '/' from the final file paths + # Just in case, removing possible double '/' from the final file paths pre_file = os.path.normpath(pre_mount + "/" + _filepath).replace("//", "/") post_file = os.path.normpath(post_mount + "/" + _filepath).replace("//", "/") diff --git a/salt/modules/uptime.py b/salt/modules/uptime.py index 50e415d3c8b..a652e5e13bd 100644 --- a/salt/modules/uptime.py +++ b/salt/modules/uptime.py @@ -56,7 +56,7 @@ def create(name, **params): raise CommandExecutionError( 'request to uptime failed : {0}'.format(req.reason) ) - log.debug('[uptime] PUT request successfull') + log.debug('[uptime] PUT request successful') return req.json()['_id'] @@ -83,7 +83,7 @@ def delete(name): raise CommandExecutionError( 'request to uptime failed : {0}'.format(req.reason) ) - log.debug('[uptime] DELETE request successfull') + log.debug('[uptime] DELETE request successful') return True diff --git a/salt/modules/win_system.py b/salt/modules/win_system.py index 97a5334eb66..7e3043d38e9 100644 --- a/salt/modules/win_system.py +++ b/salt/modules/win_system.py @@ -168,7 +168,7 @@ def reboot(timeout=5, in_seconds=False, wait_for_reboot=False, # pylint: disabl :param bool only_on_pending_reboot: If this is set to True, then then the reboot will only proceed - if the system reports a pending reboot. Setting this paramater to + if the system reports a pending reboot. Setting this parameter to True could be useful when calling this function from a final housekeeping state intended to be executed at the end of a state run (using *order: last*). diff --git a/salt/modules/x509.py b/salt/modules/x509.py index 349997988af..395cc7f5213 100644 --- a/salt/modules/x509.py +++ b/salt/modules/x509.py @@ -879,7 +879,7 @@ def create_crl( # pylint: disable=too-many-arguments,too-many-locals represents one certificate. A dict must contain either the key ``serial_number`` with the value of the serial number to revoke, or ``certificate`` with either the PEM encoded text of the certificate, - or a path ot the certificate to revoke. + or a path to the certificate to revoke. The dict can optionally contain the ``revocation_date`` key. If this key is omitted the revocation date will be set to now. If should be a diff --git a/salt/modules/xbpspkg.py b/salt/modules/xbpspkg.py index 80c9affc6c5..6b4c9986ecd 100644 --- a/salt/modules/xbpspkg.py +++ b/salt/modules/xbpspkg.py @@ -431,7 +431,7 @@ def remove(name=None, pkgs=None, recursive=True, **kwargs): The name of the package to be deleted. recursive - Also remove dependant packages (not required elsewhere). + Also remove dependent packages (not required elsewhere). Default mode: enabled. Multiple Package Options: diff --git a/salt/modules/zabbix.py b/salt/modules/zabbix.py index 52985f479c3..416aa8c263a 100644 --- a/salt/modules/zabbix.py +++ b/salt/modules/zabbix.py @@ -436,7 +436,7 @@ def user_getmedia(userids=None, **connection_args): :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) - :return: List of retreived media, False on failure. + :return: List of retrieved media, False on failure. CLI Example: .. code-block:: bash diff --git a/salt/pillar/makostack.py b/salt/pillar/makostack.py index b81fe930601..b63928752b9 100644 --- a/salt/pillar/makostack.py +++ b/salt/pillar/makostack.py @@ -57,7 +57,7 @@ You can also provide a list of config files: Select config files through grains|pillar|opts matching ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -You can also opt for a much more flexible configuration: MakoStack allows to +You can also opt for a much more flexible configuration: MakoStack allows one to select the config files for the current minion based on matching values from either grains, or pillar, or opts objects. diff --git a/salt/proxy/chronos.py b/salt/proxy/chronos.py index 57ac7def12f..3fbdc49ee89 100644 --- a/salt/proxy/chronos.py +++ b/salt/proxy/chronos.py @@ -62,7 +62,7 @@ def ping(): decode=True, ) log.debug( - 'chronos.info returned succesfully: %s', + 'chronos.info returned successfully: %s', response, ) if 'dict' in response: diff --git a/salt/proxy/cisconso.py b/salt/proxy/cisconso.py index e1e91d2951b..5b30452602b 100644 --- a/salt/proxy/cisconso.py +++ b/salt/proxy/cisconso.py @@ -270,7 +270,7 @@ def get_data(datastore, path): :type datastore: :class:`DatastoreType` (``str`` enum). :param path: The device path, a list of element names in order, - comma seperated + comma separated :type path: ``list`` of ``str`` OR ``tuple`` :return: The network configuration at that tree @@ -293,7 +293,7 @@ def set_data_value(datastore, path, data): :type datastore: :class:`DatastoreType` (``str`` enum). :param path: The device path to set the value at, - a list of element names in order, comma seperated + a list of element names in order, comma separated :type path: ``list`` of ``str`` OR ``tuple`` :param data: The new value at the given path diff --git a/salt/proxy/marathon.py b/salt/proxy/marathon.py index 1b43699c490..ae68f0106d1 100644 --- a/salt/proxy/marathon.py +++ b/salt/proxy/marathon.py @@ -62,7 +62,7 @@ def ping(): decode=True, ) log.debug( - 'marathon.info returned succesfully: %s', + 'marathon.info returned successfully: %s', response, ) if 'text' in response and response['text'].strip() == 'pong': diff --git a/salt/proxy/napalm.py b/salt/proxy/napalm.py index 37bb1ea8655..7bf21c39de8 100644 --- a/salt/proxy/napalm.py +++ b/salt/proxy/napalm.py @@ -257,7 +257,7 @@ def call(method, **params): * result (True/False): if the operation succeeded * out (object): returns the object as-is from the call * comment (string): provides more details in case the call failed - * traceback (string): complete traceback in case of exeception. Please submit an issue including this traceback + * traceback (string): complete traceback in case of exception. Please submit an issue including this traceback on the `correct driver repo`_ and make sure to read the FAQ_ .. _`correct driver repo`: https://github.com/napalm-automation/napalm/issues/new diff --git a/salt/sdb/confidant.py b/salt/sdb/confidant.py index f7275494b8c..f5d2124d29a 100644 --- a/salt/sdb/confidant.py +++ b/salt/sdb/confidant.py @@ -77,7 +77,7 @@ def get(key, profile=None): returns a dict of joined credential_pairs, credentials_metadata returns a dict of metadata relevant to the credentials mapped to the confidant service, and result returns a bool that can be used to determine if the sdb - call succeded or failed to fetch credentials from confidant (or from local + call succeeded or failed to fetch credentials from confidant (or from local cache). If result is false, the data in credentials or credentials_metadata can't be trusted. ''' diff --git a/salt/states/boto_apigateway.py b/salt/states/boto_apigateway.py index b5df0093e55..dda860770ba 100644 --- a/salt/states/boto_apigateway.py +++ b/salt/states/boto_apigateway.py @@ -117,7 +117,7 @@ def present(name, api_name, swagger_file, stage_name, api_key_required, The canconicalization of these input parameters is done in the following order: 1) lambda_funcname_format is formatted with the input parameters as passed, 2) resulting string is stripped for leading/trailing spaces, - 3) path paramter's curly braces are removed from the resource path, + 3) path parameter's curly braces are removed from the resource path, 4) consecutive spaces and forward slashes in the paths are replaced with '_' 5) consecutive '_' are replaced with '_' diff --git a/salt/states/boto_datapipeline.py b/salt/states/boto_datapipeline.py index 74133c41eba..85f97882cd7 100644 --- a/salt/states/boto_datapipeline.py +++ b/salt/states/boto_datapipeline.py @@ -322,11 +322,11 @@ def _pipeline_present_with_definition(name, expected_pipeline_objects, pipeline_objects = pipeline_definition.get('pipelineObjects') parameter_objects = pipeline_definition.get('parameterObjects') - paramater_values = pipeline_definition.get('parameterValues') + parameter_values = pipeline_definition.get('parameterValues') present = (_recursive_compare(_cleaned(pipeline_objects), _cleaned(expected_pipeline_objects)) and _recursive_compare(parameter_objects, expected_parameter_objects) and - _recursive_compare(paramater_values, expected_parameter_values)) + _recursive_compare(parameter_values, expected_parameter_values)) return present, pipeline_definition diff --git a/salt/states/boto_vpc.py b/salt/states/boto_vpc.py index f0c04bb2e71..de9f8bd6129 100644 --- a/salt/states/boto_vpc.py +++ b/salt/states/boto_vpc.py @@ -1735,10 +1735,10 @@ def delete_vpc_peering_connection(name, conn_id=None, conn_name=None, Name of the state conn_id - ID of the peering connection to delete. Exlusive with conn_name. + ID of the peering connection to delete. Exclusive with conn_name. conn_name - The name of the peering connection to delete. Exlusive with conn_id. + The name of the peering connection to delete. Exclusive with conn_id. region Region to connect to. diff --git a/salt/states/ceph.py b/salt/states/ceph.py index c79d4ac83a6..23194b19725 100644 --- a/salt/states/ceph.py +++ b/salt/states/ceph.py @@ -68,14 +68,14 @@ def quorum(name, **kwargs): - require: - sesceph: mon_running ''' - paramters = _ordereddict2dict(kwargs) - if paramters is None: - return _error(name, "Invalid paramters:%s") + parameters = _ordereddict2dict(kwargs) + if parameters is None: + return _error(name, "Invalid parameters:%s") if __opts__['test']: return _test(name, "cluster quorum") try: - cluster_quorum = __salt__['ceph.cluster_quorum'](**paramters) + cluster_quorum = __salt__['ceph.cluster_quorum'](**parameters) except (CommandExecutionError, CommandNotFoundError) as err: return _error(name, err.strerror) if cluster_quorum: diff --git a/salt/states/cisconso.py b/salt/states/cisconso.py index b23ec3b514b..eb26cfaf332 100644 --- a/salt/states/cisconso.py +++ b/salt/states/cisconso.py @@ -25,7 +25,7 @@ def value_present(name, datastore, path, config): :type datastore: :class:`DatastoreType` (``str`` enum). :param path: The device path to set the value at, - a list of element names in order, / seperated + a list of element names in order, / separated :type path: ``list``, ``str`` OR ``tuple`` :param config: The new value at the given path diff --git a/salt/states/file.py b/salt/states/file.py index 09f2e0f0ceb..b950acb1737 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -1338,7 +1338,7 @@ def managed(name, .. note:: keep does not work with salt-ssh. - As a consequence of how the files are transfered to the minion, and + As a consequence of how the files are transferred to the minion, and the inability to connect back to the master with salt-ssh, salt is unable to stat the file as it exists on the fileserver and thus cannot mirror the mode on the salt-ssh minion @@ -1553,7 +1553,7 @@ def managed(name, tmp_ext Suffix for temp file created by ``check_cmd``. Useful for checkers - dependant on config file extension (e.g. the init-checkconf upstart + dependent on config file extension (e.g. the init-checkconf upstart config checker). .. code-block:: yaml diff --git a/salt/states/junos.py b/salt/states/junos.py index a811aa0084c..59ec43c655c 100644 --- a/salt/states/junos.py +++ b/salt/states/junos.py @@ -162,7 +162,7 @@ def install_config(name, **kwargs): name: path to the configuration file. - keyworded arguments taken by load fucntion of PyEZ + keyworded arguments taken by load function of PyEZ ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.install_config'](name, **kwargs) diff --git a/salt/states/nxos.py b/salt/states/nxos.py index 680dcda062c..dc813dfb3dd 100644 --- a/salt/states/nxos.py +++ b/salt/states/nxos.py @@ -279,7 +279,7 @@ def config_absent(name): .. note:: For certain cases extra lines could be removed based on dependencies. In this example, included after the example for config_present, the - ACLs would be removed because they depend on the existance of the + ACLs would be removed because they depend on the existence of the group. ''' diff --git a/salt/states/pkg.py b/salt/states/pkg.py index 751c6e0476b..93c7286d9b1 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -1208,7 +1208,7 @@ def installed( ``3010`` is the only recognized exit code, but this is subject to future refinement. The value of this param - defaults to ``True``. This paramater has no effect + defaults to ``True``. This parameter has no effect on non-Windows systems. .. versionadded:: 2016.11.0 @@ -1803,7 +1803,7 @@ def latest( for the remainder of the current boot session. For the time being, ``3010`` is the only recognized exit code, but this is subject to future refinement. The value of this param - defaults to ``True``. This paramater has no effect on + defaults to ``True``. This parameter has no effect on non-Windows systems. .. versionadded:: 2016.11.0 diff --git a/salt/states/probes.py b/salt/states/probes.py index afa455783a0..4248da1299a 100644 --- a/salt/states/probes.py +++ b/salt/states/probes.py @@ -76,7 +76,7 @@ def _default_ret(name): def _retrieve_rpm_probes(): ''' - Will retrive the probes from the network device using salt module "probes" throught NAPALM proxy. + Will retrieve the probes from the network device using salt module "probes" throught NAPALM proxy. ''' return __salt__['probes.config']() diff --git a/salt/states/rsync.py b/salt/states/rsync.py index a57f1c04f25..6bf03876d00 100644 --- a/salt/states/rsync.py +++ b/salt/states/rsync.py @@ -43,7 +43,7 @@ def __virtual__(): def _get_summary(rsync_out): ''' - Get summary from the rsync successfull output. + Get summary from the rsync successful output. ''' return "- " + "\n- ".join([elm for elm in rsync_out.split("\n\n")[-1].replace(" ", "\n").split("\n") if elm]) @@ -51,7 +51,7 @@ def _get_summary(rsync_out): def _get_changes(rsync_out): ''' - Get changes from the rsync successfull output. + Get changes from the rsync successful output. ''' copied = list() deleted = list() diff --git a/salt/states/win_lgpo.py b/salt/states/win_lgpo.py index 0c47a50d04c..48ac6c0f62b 100644 --- a/salt/states/win_lgpo.py +++ b/salt/states/win_lgpo.py @@ -44,7 +44,7 @@ Multiple policy configuration Minimum password age: 1 Minimum password length: 14 Password must meet complexity requirements: Enabled - Store passwords using reversible encrytion: Disabled + Store passwords using reversible encryption: Disabled Configure Automatic Updates: Configure automatic updating: 4 - Auto download and schedule the intsall Scheduled install day: 7 - Every Saturday diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py index 25b4ba57db3..97311f6fb2a 100644 --- a/salt/utils/__init__.py +++ b/salt/utils/__init__.py @@ -2161,7 +2161,7 @@ def namespaced_function(function, global_dict, defaults=None, preserve_context=F Redefine (clone) a function under a different globals() namespace scope preserve_context: - Allow to keep the context taken from orignal namespace, + Allow keeping the context taken from orignal namespace, and extend it with globals() taken from new targetted namespace. ''' diff --git a/salt/utils/extend.py b/salt/utils/extend.py index c66b4d9eae2..9a5885e50f1 100644 --- a/salt/utils/extend.py +++ b/salt/utils/extend.py @@ -227,7 +227,7 @@ def run(extension=None, name=None, description=None, salt_dir=None, merge=False, :param salt_dir: The targeted Salt source directory :type salt_dir: ``str`` - :param merge: Merge with salt directory, `False` to keep seperate, `True` to merge trees. + :param merge: Merge with salt directory, `False` to keep separate, `True` to merge trees. :type merge: ``bool`` :param temp_dir: The directory for generated code, if omitted, system temp will be used diff --git a/salt/utils/network.py b/salt/utils/network.py index 036c00d4300..191739c58b5 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -91,7 +91,7 @@ def _generate_minion_id(): class DistinctList(list): ''' - List, which allows to append only distinct objects. + List, which allows one to append only distinct objects. Needs to work on Python 2.6, because of collections.OrderedDict only since 2.7 version. Override 'filter()' for custom filtering. ''' diff --git a/salt/utils/process.py b/salt/utils/process.py index c3b514fff6d..1b83eb7d426 100644 --- a/salt/utils/process.py +++ b/salt/utils/process.py @@ -278,7 +278,7 @@ class ProcessManager(object): kwargs = {} if salt.utils.is_windows(): - # Need to ensure that 'log_queue' is correctly transfered to + # Need to ensure that 'log_queue' is correctly transferred to # processes that inherit from 'MultiprocessingProcess'. if type(MultiprocessingProcess) is type(tgt) and ( issubclass(tgt, MultiprocessingProcess)): diff --git a/salt/utils/templates.py b/salt/utils/templates.py index 1450c20cc7d..68c78ef3618 100644 --- a/salt/utils/templates.py +++ b/salt/utils/templates.py @@ -272,7 +272,7 @@ def _get_jinja_error(trace, context=None): ): add_log = True template_path = error[0] - # if we add a log, format explicitly the exeception here + # if we add a log, format explicitly the exception here # by telling to output the macro context after the macro # error log place at the beginning if add_log: diff --git a/setup.py b/setup.py index 3d831391e32..6fcbbfce14f 100755 --- a/setup.py +++ b/setup.py @@ -765,8 +765,8 @@ class InstallLib(install_lib): chmod = [] for idx, inputfile in enumerate(inp): - for executeable in executables: - if inputfile.endswith(executeable): + for executable in executables: + if inputfile.endswith(executable): chmod.append(idx) for idx in chmod: filename = out[idx] diff --git a/tests/integration/cloud/providers/virtualbox.py b/tests/integration/cloud/providers/virtualbox.py index f1a7452f1d2..5d27c336ebd 100644 --- a/tests/integration/cloud/providers/virtualbox.py +++ b/tests/integration/cloud/providers/virtualbox.py @@ -457,19 +457,19 @@ class XpcomConversionTests(unittest.TestCase): for key in expected_extras.keys(): self.assertIn(key, ret_keys) - def test_extra_nonexistant_attributes(self): + def test_extra_nonexistent_attributes(self): expected_extra_dict = { - "nonexistant": "" + "nonexistent": "" } xpcom = XpcomConversionTests._mock_xpcom_object() ret = vb_xpcom_to_attribute_dict(xpcom, extra_attributes=expected_extra_dict.keys()) self.assertDictEqual(ret, expected_extra_dict) - def test_extra_nonexistant_attribute_with_default(self): - expected_extras = [("nonexistant", list)] + def test_extra_nonexistent_attribute_with_default(self): + expected_extras = [("nonexistent", list)] expected_extra_dict = { - "nonexistant": [] + "nonexistent": [] } xpcom = XpcomConversionTests._mock_xpcom_object() diff --git a/tests/integration/netapi/rest_tornado/test_app.py b/tests/integration/netapi/rest_tornado/test_app.py index a240cb5a4c4..7dad557a70a 100644 --- a/tests/integration/netapi/rest_tornado/test_app.py +++ b/tests/integration/netapi/rest_tornado/test_app.py @@ -77,7 +77,7 @@ class TestSaltAPIHandler(SaltnadoTestCase): self.assertEqual(response.headers['Location'], '/login') # Local client tests - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_simple_local_post(self): ''' Test a basic API of / @@ -312,7 +312,7 @@ class TestMinionSaltAPIHandler(SaltnadoTestCase): for minion_id, grains in six.iteritems(response_obj['return'][0]): self.assertEqual(minion_id, grains['id']) - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_get(self): response = self.fetch('/minions/minion', method='GET', @@ -396,7 +396,7 @@ class TestJobsSaltAPIHandler(SaltnadoTestCase): application.event_listener = saltnado.EventListener({}, self.opts) return application - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_get(self): # test with no JID self.http_client.fetch(self.get_url('/jobs'), @@ -449,7 +449,7 @@ class TestRunSaltAPIHandler(SaltnadoTestCase): application.event_listener = saltnado.EventListener({}, self.opts) return application - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_get(self): low = [{'client': 'local', 'tgt': '*', diff --git a/tests/integration/runners/jobs.py b/tests/integration/runners/jobs.py index 57ac15ae748..0c666e6c3dd 100644 --- a/tests/integration/runners/jobs.py +++ b/tests/integration/runners/jobs.py @@ -34,7 +34,7 @@ class ManageTest(integration.ShellCase): self.assertEqual(ret['return'], {}) self.assertEqual(ret['out'], []) - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_list_jobs(self): ''' jobs.list_jobs diff --git a/tests/integration/shell/call.py b/tests/integration/shell/call.py index e444743720c..fd73dd92c9f 100644 --- a/tests/integration/shell/call.py +++ b/tests/integration/shell/call.py @@ -144,7 +144,7 @@ class CallTest(integration.ShellCase, testprogram.TestProgramCase, integration.S self.assertNotEqual(0, retcode) @skipIf(sys.platform.startswith('win'), 'This test does not apply on Win') - @skipIf(True, 'to be reenabled when #23623 is merged') + @skipIf(True, 'to be re-enabled when #23623 is merged') def test_return(self): self.run_call('cmd.run "echo returnTOmaster"') jobs = [a for a in self.run_run('jobs.list_jobs')] diff --git a/tests/integration/states/git.py b/tests/integration/states/git.py index 02c2fb5fba2..ad3edb59550 100644 --- a/tests/integration/states/git.py +++ b/tests/integration/states/git.py @@ -521,7 +521,7 @@ class LocalRepoGitTest(integration.ModuleCase, integration.SaltReturnAssertsMixI os.path.join(repo, 'refs', 'heads', 'develop') ) - # Run git.latest state. This should successfuly clone and fail with a + # Run git.latest state. This should successfully clone and fail with a # specific error in the comment field. ret = self.run_state( 'git.latest', diff --git a/tests/integration/states/pkg.py b/tests/integration/states/pkg.py index bc85b10cb28..61eb35b9fc5 100644 --- a/tests/integration/states/pkg.py +++ b/tests/integration/states/pkg.py @@ -492,7 +492,7 @@ class PkgTest(integration.ModuleCase, Need to check to ensure the package has been installed after the pkg_latest_epoch sls file has been run. This needs to be broken up into - a seperate method so I can add the requires_salt_modules + a separate method so I can add the requires_salt_modules decorator to only the pkg.info_installed command. ''' # Skip test if package manager not available diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py index 4fb8799a6db..2b28e90d7dc 100644 --- a/tests/integration/utils/testprogram.py +++ b/tests/integration/utils/testprogram.py @@ -182,7 +182,7 @@ class TestProgram(six.with_metaclass(TestProgramMeta, object)): @property def start_pid(self): - '''PID of the called script prior to deamonizing.''' + '''PID of the called script prior to daemonizing.''' return self.process.pid if self.process else None @property diff --git a/tests/unit/modules/win_powercfg_test.py b/tests/unit/modules/win_powercfg_test.py index bb5270920c2..345a8f06a12 100644 --- a/tests/unit/modules/win_powercfg_test.py +++ b/tests/unit/modules/win_powercfg_test.py @@ -25,7 +25,7 @@ powercfg.__grains__ = {'osrelease': 8} @skipIf(NO_MOCK, NO_MOCK_REASON) class PowerCfgTestCase(TestCase): - query_ouput = '''Subgroup GUID: 238c9fa8-0aad-41ed-83f4-97be242c8f20 (Hibernate) + query_output = '''Subgroup GUID: 238c9fa8-0aad-41ed-83f4-97be242c8f20 (Hibernate) GUID Alias: SUB_SLEEP Power Setting GUID: 29f6c1db-86da-48c5-9fdb-f2b67b1f44da (Hibernate after) GUID Alias: HIBERNATEIDLE @@ -80,7 +80,7 @@ class PowerCfgTestCase(TestCase): Test to make sure we can get the monitor timeout value ''' mock = MagicMock() - mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_ouput] + mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_output] with patch.dict(powercfg.__salt__, {'cmd.run': mock}): ret = powercfg.get_monitor_timeout() @@ -97,7 +97,7 @@ class PowerCfgTestCase(TestCase): Test to make sure we can get the disk timeout value ''' mock = MagicMock() - mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_ouput] + mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_output] with patch.dict(powercfg.__salt__, {'cmd.run': mock}): ret = powercfg.get_disk_timeout() @@ -114,7 +114,7 @@ class PowerCfgTestCase(TestCase): Test to make sure we can get the standby timeout value ''' mock = MagicMock() - mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_ouput] + mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_output] with patch.dict(powercfg.__salt__, {'cmd.run': mock}): ret = powercfg.get_standby_timeout() @@ -131,7 +131,7 @@ class PowerCfgTestCase(TestCase): Test to make sure we can get the hibernate timeout value ''' mock = MagicMock() - mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_ouput] + mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_output] with patch.dict(powercfg.__salt__, {'cmd.run': mock}): ret = powercfg.get_hibernate_timeout() @@ -148,7 +148,7 @@ class PowerCfgTestCase(TestCase): Test to make sure we can get the hibernate timeout value on windows 7 ''' mock = MagicMock() - mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_ouput] + mock.side_effect = ["Power Scheme GUID: 381b4222-f694-41f0-9685-ff5bb260df2e (Balanced)", self.query_output] with patch.dict(powercfg.__salt__, {'cmd.run': mock}): with patch.dict(powercfg.__grains__, {'osrelease': '7'}): diff --git a/tests/unit/states/dockerng_test.py b/tests/unit/states/dockerng_test.py index a4af3e16147..884776bfb8a 100644 --- a/tests/unit/states/dockerng_test.py +++ b/tests/unit/states/dockerng_test.py @@ -361,7 +361,7 @@ class DockerngTestCase(TestCase): - force: true if ``image:latest`` is not downloaded and force is true - should pull a new image successfuly. + should pull a new image successfully. ''' dockerng_inspect_image = Mock( side_effect=CommandExecutionError(