diff -Nru salt-2018.3.4+dfsg1/debian/changelog salt-2018.3.4+dfsg1/debian/changelog --- salt-2018.3.4+dfsg1/debian/changelog 2019-05-02 11:23:44.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/changelog 2019-05-24 13:01:45.000000000 +0000 @@ -1,3 +1,15 @@ +salt (2018.3.4+dfsg1-6) unstable; urgency=medium + + * Revert changes that were rejected by the release team: + - Drop fixing various spelling mistakes + - Drop using jquery.js from sphinx + - Drop using dh_sphinxdoc + - Drop patch to set script type explicitly to text/javascript + * doc: Use local Open Sans fonts instead of querying Google + to fix possible privacy breach + + -- Benjamin Drung Fri, 24 May 2019 15:01:45 +0200 + salt (2018.3.4+dfsg1-5) unstable; urgency=medium * Cherry-pick upstream patch to fix edge case when minion ID is a diff -Nru salt-2018.3.4+dfsg1/debian/control salt-2018.3.4+dfsg1/debian/control --- salt-2018.3.4+dfsg1/debian/control 2019-04-25 15:08:50.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/control 2019-05-24 13:01:45.000000000 +0000 @@ -11,8 +11,6 @@ debhelper (>= 11), dh-python, dpkg-dev (>= 1.16.2), - libjs-bootstrap, - libjs-modernizr, python3, python3 (>= 3.6) | python3-mock, python3-augeas, @@ -54,7 +52,6 @@ python3-twilio, python3-yaml, python3-zmq (>= 13.1.0), - sphinx-common, virtualenv Build-Depends-Indep: python3-doc, python3-sphinx (>= 1.3.5) Standards-Version: 4.3.0 @@ -222,11 +219,12 @@ Package: salt-doc Architecture: all Section: doc -Built-Using: ${sphinxdoc:Built-Using} -Depends: libjs-bootstrap, +Depends: fonts-open-sans, + libjs-bootstrap, + libjs-jquery, libjs-modernizr, - ${misc:Depends}, - ${sphinxdoc:Depends} + libjs-sphinxdoc, + ${misc:Depends} Breaks: salt-common (<< 2016.11.5) Replaces: salt-common (<< 2016.11.5) Description: additional documentation for salt, the distributed remote execution system diff -Nru salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch --- salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch 2019-04-25 15:09:29.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/doc-Set-script-type-explicitly-to-text-javascript.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From e22e49d974937ed9107cf33c679799c914f27777 Mon Sep 17 00:00:00 2001 -From: Benjamin Drung -Date: Thu, 25 Apr 2019 11:53:09 +0200 -Subject: [PATCH] doc: Set script type explicitly to text/javascript - -dh_sphinxdoc (used for building the documentation in the Debian package) -searches for script lines and expect the type set to text/javascript. -Otherwise dh_sphinxdoc won't find the scripts. - -Therefore mark the JavaScript scripts explicitly as text/javascript. - -Forwarded: https://github.com/saltstack/salt/pull/52693 -Signed-off-by: Benjamin Drung ---- - doc/_themes/saltstack/layout.html | 6 +++--- - doc/_themes/saltstack2/layout.html | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html -index 85e0a3cfa4..8c4380e7f2 100644 ---- a/doc/_themes/saltstack/layout.html -+++ b/doc/_themes/saltstack/layout.html -@@ -81,7 +81,7 @@ - - {%- for scriptfile in script_files %} - {% if scriptfile not in js_blacklist %} -- -+ - {% endif %} - {%- endfor %} - {%- endmacro %} -@@ -159,7 +159,7 @@ - {%- endblock %} - - {%- block extrahead %} {% endblock %} -- -+ - - {%- block analytics %} - {% endblock %} -@@ -258,7 +258,7 @@ - - {%- endblock %} - -- -+ - - {% if on_saltstack %} - --- -2.20.1 - diff -Nru salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch --- salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch 2019-04-25 15:09:29.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/ensure-searchtools.js-gets-included.patch 2019-05-24 13:01:45.000000000 +0000 @@ -13,8 +13,8 @@ index 85e0a3cf..6e5c70e0 100644 --- a/doc/_themes/saltstack/layout.html +++ b/doc/_themes/saltstack/layout.html -@@ -23,6 +23,9 @@ - {% set script_files = [ +@@ -29,6 +29,9 @@ + '_static/js/vendor/jquery-1.9.1.js', '_static/js/vendor/bootstrap.min.js', ] + script_files %} +{% if not '_static/searchtools.js' in script_files %} diff -Nru salt-2018.3.4+dfsg1/debian/patches/fix-various-spelling-mistakes.patch salt-2018.3.4+dfsg1/debian/patches/fix-various-spelling-mistakes.patch --- salt-2018.3.4+dfsg1/debian/patches/fix-various-spelling-mistakes.patch 2019-04-25 15:27:28.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/fix-various-spelling-mistakes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4058 +0,0 @@ -Description: Fix various spelling mistakes -Author: Benjamin Drung -Forwarded: https://github.com/saltstack/salt/pull/51594 - -diff --git a/doc/topics/releases/2014.7.6.rst b/doc/topics/releases/2014.7.6.rst -index f522ff486a..f87c5ef2a1 100644 ---- a/doc/topics/releases/2014.7.6.rst -+++ b/doc/topics/releases/2014.7.6.rst -@@ -90,7 +90,7 @@ Changelog for v2014.7.5..v2014.7.6 - - * 2d9aa2bb97 Avoid shadowing variables in lxc module - -- * 792e1021f2 Allow to override profile options in lxc.cloud_init_interface -+ * 792e1021f2 Allow overriding profile options in lxc.cloud_init_interface - - * 42bd64b9b3 Return changes on successful lxc.create from salt-cloud - -@@ -318,9 +318,9 @@ Changelog for v2014.7.5..v2014.7.6 - * **PR** `#23551`_: (`dr4Ke`_) grains.append unit tests, related to `#23474`_ - @ *2015-05-11 21:54:25 UTC* - -- * **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23551`_) -+ * **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionary grains `#23411`_ (refs: `#23551`_) - -- * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23474`_) -+ * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionary grains `#23411`_ (refs: `#23474`_) - - * 6ec87ce9f5 Merge pull request `#23551`_ from dr4Ke/grains.append_unit_tests - -@@ -334,10 +334,10 @@ Changelog for v2014.7.5..v2014.7.6 - - * **ISSUE** `#23411`_: (`dr4Ke`_) grains.append should work at any level of a grain (refs: `#23440`_, `#23474`_) - --* **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23551`_) -+* **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionary grains `#23411`_ (refs: `#23551`_) - @ *2015-05-11 18:00:21 UTC* - -- * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23474`_) -+ * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionary grains `#23411`_ (refs: `#23474`_) - - * e96c5c5bf3 Merge pull request `#23474`_ from dr4Ke/fix_grains.append_nested - -@@ -345,7 +345,7 @@ Changelog for v2014.7.5..v2014.7.6 - - * b39f50475d remove debugging output - -- * b6e15e295c fix grains.append in nested dictionnary grains `#23411`_ -+ * b6e15e295c fix grains.append in nested dictionary grains `#23411`_ - - * **PR** `#23537`_: (`t0rrant`_) Update changelog - @ *2015-05-11 17:02:16 UTC* -@@ -558,12 +558,12 @@ Changelog for v2014.7.5..v2014.7.6 - - * **ISSUE** `#22742`_: (`hvnsweeting`_) salt-master says: "This master address: 'salt' was previously resolvable but now fails to resolve!" (refs: `#23344`_) - --* **PR** `#23344`_: (`cachedout`_) Explicitely set file_client on master -+* **PR** `#23344`_: (`cachedout`_) Explicitly set file_client on master - @ *2015-05-04 23:21:48 UTC* - - * 02658b1e60 Merge pull request `#23344`_ from cachedout/issue_22742 - -- * 5adc96ce7f Explicitely set file_client on master -+ * 5adc96ce7f Explicitly set file_client on master - - * **PR** `#23318`_: (`cellscape`_) Honor seed argument in LXC container initializaton - @ *2015-05-04 20:58:12 UTC* -@@ -858,7 +858,7 @@ Changelog for v2014.7.5..v2014.7.6 - * **PR** `#23113`_: (`rallytime`_) Revert "Backport `#22895`_ to 2014.7" - @ *2015-04-28 03:27:29 UTC* - -- * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a succesfull login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) -+ * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a successful login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) - - * dfe2066b25 Merge pull request `#23113`_ from saltstack/revert-22925-bp-22895 - -@@ -1040,7 +1040,7 @@ Changelog for v2014.7.5..v2014.7.6 - * **PR** `#22925`_: (`rallytime`_) Backport `#22895`_ to 2014.7 - @ *2015-04-22 02:30:26 UTC* - -- * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a succesfull login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) -+ * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a successful login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) - - * 6890752dd3 Merge pull request `#22925`_ from rallytime/bp-22895 - -@@ -1050,7 +1050,7 @@ Changelog for v2014.7.5..v2014.7.6 - - * 5ebf159554 Cleaned up pull request - -- * a08ac478f6 pam_tally counter was not reset to 0 after a succesfull login -+ * a08ac478f6 pam_tally counter was not reset to 0 after a successful login - - * **ISSUE** `#22790`_: (`whiteinge`_) jobs.list_jobs runner tracebacks on 'missing' argument (refs: `#22914`_) - -diff --git a/doc/topics/releases/2015.5.1.rst b/doc/topics/releases/2015.5.1.rst -index 8ae0122f30..b65db02c2c 100644 ---- a/doc/topics/releases/2015.5.1.rst -+++ b/doc/topics/releases/2015.5.1.rst -@@ -175,7 +175,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * 9d87fd335c add proper marker for format argument - -- * 197688ef0c Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occuring at the time of one of these exceptions. -+ * 197688ef0c Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occurring at the time of one of these exceptions. - - * **ISSUE** `#19852`_: (`TaiSHiNet`_) DigitalOcean APIv2 can't delete machines when there is only 1 page (refs: `#23955`_) - -@@ -549,7 +549,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * 558798df1f Fix net_io_counters deprecation issue - -- * 8140f92ba8 Override unecessary pylint errors -+ * 8140f92ba8 Override unnecessary pylint errors - - * 7d02ad4f06 Fix some of the mock names for the new API - -@@ -561,7 +561,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * e48982ff9c Fix version checking in psutil_compat - -- * 93ee411fd5 Create compatability psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. -+ * 93ee411fd5 Create compatibility psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. - - * **PR** `#23782`_: (`terminalmage`_) Replace "command -v" with "which" and get rid of spurious log messages - @ *2015-05-16 04:03:10 UTC* -@@ -601,7 +601,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * 2d9aa2bb97 Avoid shadowing variables in lxc module - -- * 792e1021f2 Allow to override profile options in lxc.cloud_init_interface -+ * 792e1021f2 Allow overriding profile options in lxc.cloud_init_interface - - * 42bd64b9b3 Return changes on successful lxc.create from salt-cloud - -@@ -830,12 +830,12 @@ Changelog for v2015.5.0..v2015.5.1 - - * ecff2181e4 fix lvs_service - --* **PR** `#23686`_: (`jfindlay`_) remove superflous return statement -+* **PR** `#23686`_: (`jfindlay`_) remove superfluous return statement - @ *2015-05-14 14:20:18 UTC* - - * 39973d4095 Merge pull request `#23686`_ from jfindlay/fix_lvs_server - -- * 5aaeb73532 remove superflous return statement -+ * 5aaeb73532 remove superfluous return statement - - * **PR** `#23690`_: (`rallytime`_) Backport `#23424`_ to 2015.5 - @ *2015-05-13 23:04:36 UTC* -@@ -959,7 +959,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * b39f50475d remove debugging output - -- * b6e15e295c fix grains.append in nested dictionnary grains `#23411`_ -+ * b6e15e295c fix grains.append in nested dictionary grains `#23411`_ - - * ab7e1aed8e Merge pull request `#23537`_ from t0rrant/patch-1 - -@@ -976,7 +976,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * 73cfda751a Remove unused import - -- * 52b68d695a Use the zip_longest from six module for python 3 compatiblity -+ * 52b68d695a Use the zip_longest from six module for python 3 compatibility - - * 18d5ff9a8e Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes - -@@ -1552,7 +1552,7 @@ Changelog for v2015.5.0..v2015.5.1 - - * 02658b1e60 Merge pull request `#23344`_ from cachedout/issue_22742 - -- * 5adc96ce7f Explicitely set file_client on master -+ * 5adc96ce7f Explicitly set file_client on master - - * ba7605d1cb Merge pull request `#23318`_ from cellscape/honor-seed-argument - -diff --git a/doc/topics/releases/2015.5.11.rst b/doc/topics/releases/2015.5.11.rst -index 899a2909c5..3fd37ae9e2 100644 ---- a/doc/topics/releases/2015.5.11.rst -+++ b/doc/topics/releases/2015.5.11.rst -@@ -259,7 +259,7 @@ Changelog for v2015.5.10..v2015.5.11 - - * **PR** `#32421`_: (`terminalmage`_) Ignore Raspbian in service.py __virtual__ - --* **ISSUE** `#1409`_: (`twinshadow`_) module/network.py: Interfaces do not list multiple addesses -+* **ISSUE** `#1409`_: (`twinshadow`_) module/network.py: Interfaces do not list multiple addresses - - * **ISSUE** `saltstack/salt#28262`_: (`palica`_) FreeBSD pkgng provider raising error for minion (refs: `#32376`_) - -@@ -434,9 +434,9 @@ Changelog for v2015.5.10..v2015.5.11 - - * d18b4be80b remove whitespace end of line 186:q - -- * d2b89c85ad fix formating -+ * d2b89c85ad fix formatting - -- * 103cee9e29 cleaned up formating -+ * 103cee9e29 cleaned up formatting - - * 7a4d7f0bff added whitespace - -diff --git a/doc/topics/releases/2015.5.2.rst b/doc/topics/releases/2015.5.2.rst -index 0c5a91cbc6..b94380a608 100644 ---- a/doc/topics/releases/2015.5.2.rst -+++ b/doc/topics/releases/2015.5.2.rst -@@ -115,7 +115,7 @@ Changelog for v2015.5.1..v2015.5.2 - - * 02bfb254d6 Merge pull request `#24281`_ from steverweber/ipmi_docfix - -- * dd36f2c555 yaml formating -+ * dd36f2c555 yaml formatting - - * f6deef3047 include api_kg kwarg in ipmi state - -@@ -249,7 +249,7 @@ Changelog for v2015.5.1..v2015.5.2 - - * 608da5ef5d modules/lxc: merge resolution - -- * 27c4689a24 modules/lxc: more consistent comparsion -+ * 27c4689a24 modules/lxc: more consistent comparison - - * 07c365a23b lxc: merge conflict spotted - -@@ -1020,7 +1020,7 @@ Changelog for v2015.5.1..v2015.5.2 - - * 1dc67e5678 lxc: versionadded - -- * fcad7cb804 lxc: states improvments -+ * fcad7cb804 lxc: states improvements - - * 644bd729f7 lxc: more consistence for profiles - -diff --git a/doc/topics/releases/2015.5.3.rst b/doc/topics/releases/2015.5.3.rst -index f9a0f89981..a42171ce45 100644 ---- a/doc/topics/releases/2015.5.3.rst -+++ b/doc/topics/releases/2015.5.3.rst -@@ -62,7 +62,7 @@ Changelog for v2015.5.2..v2015.5.3 - - * 564dffd14a depend on win libs rather than mocking them - -- * 9b9aeb8628 resolved all erors. -+ * 9b9aeb8628 resolved all errors. - - * aaf89354c0 adding win_groupadd unit test case. - -@@ -221,7 +221,7 @@ Changelog for v2015.5.2..v2015.5.3 - - * a3c1063a37 fix deprecated pymongo usage causing errors in latest pymongo - --* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after succesfully completed (refs: `#24994`_, `#24966`_) -+* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after successfully completed (refs: `#24994`_, `#24966`_) - - * **PR** `#24994`_: (`garethgreenaway`_) Another Fix to gpg.py in 2015.5 - @ *2015-06-27 22:28:15 UTC* -@@ -273,7 +273,7 @@ Changelog for v2015.5.2..v2015.5.3 - - * 6b544227ab Only warn about digital ocean deprecation if digital ocean is configured - --* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after succesfully completed (refs: `#24994`_, `#24966`_) -+* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after successfully completed (refs: `#24994`_, `#24966`_) - - * **PR** `#24966`_: (`garethgreenaway`_) Fixes to gpg.py in 2015.5 - @ *2015-06-25 19:58:49 UTC* -@@ -583,11 +583,11 @@ Changelog for v2015.5.2..v2015.5.3 - * **PR** `#24791`_: (`rallytime`_) Back-port `#24749`_ to 2015.5 - @ *2015-06-18 17:43:15 UTC* - -- * **PR** `#24749`_: (`obestwalter`_) add windows specfic default for multiprocessing (refs: `#24791`_) -+ * **PR** `#24749`_: (`obestwalter`_) add windows specific default for multiprocessing (refs: `#24791`_) - - * 7073a9f850 Merge pull request `#24791`_ from rallytime/bp-24749 - -- * be43b2b394 add windows specfic default for multiprocessing -+ * be43b2b394 add windows specific default for multiprocessing - - * **PR** `#24792`_: (`rallytime`_) Back-port `#24757`_ to 2015.5 - @ *2015-06-18 15:58:35 UTC* -@@ -1033,7 +1033,7 @@ Changelog for v2015.5.2..v2015.5.3 - - * **ISSUE** `#24480`_: (`kiorky`_) [CRITICAL] [2015.5] tls breaks tzinfo (refs: `#24551`_) - --* **PR** `#24551`_: (`joejulian`_) 2015.5 dont pollute environment -+* **PR** `#24551`_: (`joejulian`_) 2015.5 don't pollute environment - @ *2015-06-11 02:13:06 UTC* - - * 20ada1f8a1 Merge pull request `#24551`_ from joejulian/2015.5_dont_pollute_environment -@@ -1355,13 +1355,13 @@ Changelog for v2015.5.2..v2015.5.3 - * **PR** `#24456`_: (`rallytime`_) Back-port `#24441`_ to 2015.5 - @ *2015-06-05 22:32:25 UTC* - -- * **PR** `#24441`_: (`arthurlogilab`_) [doc] Alignement fix on external_auth documentation (refs: `#24456`_) -+ * **PR** `#24441`_: (`arthurlogilab`_) [doc] Alignment fix on external_auth documentation (refs: `#24456`_) - - * ced558a6e6 Merge pull request `#24456`_ from rallytime/bp-24441 - - * 70028553c1 yaml indentations should be 2 spaces - -- * 21b51abf25 [doc] Alignement fix on external_auth documentation -+ * 21b51abf25 [doc] Alignment fix on external_auth documentation - - * **ISSUE** `#24397`_: (`kiorky`_) on debian: states.apt should use virtualname as it shadows system apt module (refs: `#24398`_, `#24400`_, `#24399`_) - -diff --git a/doc/topics/releases/2015.5.4.rst b/doc/topics/releases/2015.5.4.rst -index f7e9c9faf7..75bdb5982a 100644 ---- a/doc/topics/releases/2015.5.4.rst -+++ b/doc/topics/releases/2015.5.4.rst -@@ -86,12 +86,12 @@ Changelog for v2015.5.3..v2015.5.4 - - * a1f90fa070 Only call convert_to_arn when action name is provided - --* **PR** `#26288`_: (`bbinet`_) allow to delete grains which value is False -+* **PR** `#26288`_: (`bbinet`_) allow deleting grains which value is False - @ *2015-08-13 18:24:36 UTC* - - * c81dc0b62f Merge pull request `#26288`_ from bbinet/grains-absent-fix - -- * f46722aaeb allow to delete grains which value is False -+ * f46722aaeb allow deleting grains which value is False - - * **ISSUE** `#24882`_: (`nmadhok`_) salt.states.openstack_config.present and salt.states.openstack_config.absent make changes when test=True (refs: `#26263`_) - -@@ -913,7 +913,7 @@ Changelog for v2015.5.3..v2015.5.4 - - * d7f448d501 Needed popen.wait(). - -- * 25f8042e41 Checking for scp existance. Using command -v should be POSIX -+ * 25f8042e41 Checking for scp existence. Using command -v should be POSIX - - * 6b2100a30b New exitcode for SCP not found Re: https://github.com/saltstack/salt/issues/25478 and https://github.com/saltstack/salt/issues/25026 - -@@ -1006,7 +1006,7 @@ Changelog for v2015.5.3..v2015.5.4 - - * 067ea788e9 Add salt:// to key_url options to docs for pkgrepo.managed - --* **ISSUE** `#22699`_: (`arthurlogilab`_) salt-cloud fails on KeyError when given a nonexistant action (refs: `#25807`_) -+* **ISSUE** `#22699`_: (`arthurlogilab`_) salt-cloud fails on KeyError when given a nonexistent action (refs: `#25807`_) - - * **PR** `#25807`_: (`rallytime`_) Provide helpful error when using actions with a mapfile - @ *2015-07-29 15:30:15 UTC* -@@ -1460,7 +1460,7 @@ Changelog for v2015.5.3..v2015.5.4 - - * 8a1765fc6f Add version_cmp function to yumpkg.py - -- * 457e72e273 Fix refernces to __salt__['version_cmp'] -+ * 457e72e273 Fix references to __salt__['version_cmp'] - - * a19fa2296a Avoid using single-letter variable - -@@ -1923,11 +1923,11 @@ Changelog for v2015.5.3..v2015.5.4 - * **PR** `#25392`_: (`rallytime`_) Back-port `#25256`_ to 2015.5 - @ *2015-07-14 03:25:13 UTC* - -- * **PR** `#25256`_: (`yanatan16`_) Dont assume source_hash exists (refs: `#25392`_) -+ * **PR** `#25256`_: (`yanatan16`_) Don't assume source_hash exists (refs: `#25392`_) - - * 008e3295c6 Merge pull request `#25392`_ from rallytime/bp-25256 - -- * 6b2da4d582 Dont assume source_hash exists -+ * 6b2da4d582 Don't assume source_hash exists - - * **PR** `#25398`_: (`twangboy`_) Fix date - @ *2015-07-14 03:21:17 UTC* -@@ -2029,7 +2029,7 @@ Changelog for v2015.5.3..v2015.5.4 - - * e13a9fd74e Fix documentation for file.blockreplace - --* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0 (refs: `#25326`_, `#20972`_) -+* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0 (refs: `#25326`_, `#20972`_) - - * **PR** `#25326`_: (`rallytime`_) Back-port `#20972`_ to 2015.5 - @ *2015-07-10 18:49:44 UTC* -@@ -2347,7 +2347,7 @@ Changelog for v2015.5.3..v2015.5.4 - - * 9a1351eada Change print to logger, so we can set a level and log exc_info - --* **PR** `#25120`_: (`d--j`_) add missing continue for exeption case -+* **PR** `#25120`_: (`d--j`_) add missing continue for exception case - @ *2015-07-02 19:38:45 UTC* - - * a723af0f10 Merge pull request `#25120`_ from d--j/patch-2 -diff --git a/doc/topics/releases/2015.5.5.rst b/doc/topics/releases/2015.5.5.rst -index 939a4c5621..beffe4e469 100644 ---- a/doc/topics/releases/2015.5.5.rst -+++ b/doc/topics/releases/2015.5.5.rst -@@ -92,12 +92,12 @@ Changelog for v2015.5.4..v2015.5.5 - - * cbe330e78b add dateutil dependency reporting - --* **PR** `#26494`_: (`cachedout`_) Remove unecessary debug statements -+* **PR** `#26494`_: (`cachedout`_) Remove unnecessary debug statements - @ *2015-08-19 20:46:00 UTC* - - * 4fff53b842 Merge pull request `#26494`_ from cachedout/remove_debug_statements - -- * d717a43dcc Remove unecessary debug statements -+ * d717a43dcc Remove unnecessary debug statements - - * **PR** `#26465`_: (`rallytime`_) Back-port `#26457`_ to 2015.5 - @ *2015-08-19 16:08:16 UTC* -@@ -231,7 +231,7 @@ Changelog for v2015.5.4..v2015.5.5 - - * 87151736c5 Merge pull request `#26371`_ from bastiaanb/fix/issue-26161-salt-initscripts-dont-set-lockfile - -- * ec8d4b0470 test wether RETVAL is 0 with -eq rather than =. -+ * ec8d4b0470 test whether RETVAL is 0 with -eq rather than =. - - * a83a5de41e fix issue `#26161`_: on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown. - -diff --git a/doc/topics/releases/2015.5.6.rst b/doc/topics/releases/2015.5.6.rst -index a0f9470edb..582a2e84fb 100644 ---- a/doc/topics/releases/2015.5.6.rst -+++ b/doc/topics/releases/2015.5.6.rst -@@ -105,12 +105,12 @@ Changelog for v2015.5.5..v2015.5.6 - - * **ISSUE** `#27447`_: (`junster1`_) Fix mysql table size for salt_events (refs: `#27472`_) - --* **PR** `#27472`_: (`cachedout`_) Change recommeded schema for data field in mysql event table -+* **PR** `#27472`_: (`cachedout`_) Change recommended schema for data field in mysql event table - @ *2015-09-29 15:49:37 UTC* - - * 68d784c3dd Merge pull request `#27472`_ from cachedout/fix_27447 - -- * 5e745ad6da Change recommeded schema for data field in mysql event table -+ * 5e745ad6da Change recommended schema for data field in mysql event table - - * **PR** `#27468`_: (`cachedout`_) Fix 27351 - @ *2015-09-29 15:35:29 UTC* -@@ -185,7 +185,7 @@ Changelog for v2015.5.5..v2015.5.6 - - * ed6207a438 Merge pull request `#27419`_ from rallytime/fix-9856 - -- * 551396564a Ammend error log to include multiple tips for troubleshooting. -+ * 551396564a Amend error log to include multiple tips for troubleshooting. - - * **ISSUE** `#16753`_: (`johtso`_) Duplicate selector in top file gives unhelpful traceback (refs: `#27426`_) - -@@ -205,7 +205,7 @@ Changelog for v2015.5.5..v2015.5.6 - - * 39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. - -- * de2f9234d3 Use correct default for bandwith -+ * de2f9234d3 Use correct default for bandwidth - - * 42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. - -diff --git a/doc/topics/releases/2015.5.7.rst b/doc/topics/releases/2015.5.7.rst -index b86107fdf9..b711ef708c 100644 ---- a/doc/topics/releases/2015.5.7.rst -+++ b/doc/topics/releases/2015.5.7.rst -@@ -504,7 +504,7 @@ Changelog for v2015.5.6..v2015.5.7 - - * b1f4a2bdf4 i think i changed the wrong header, updated to fix - -- * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. -+ * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands won't bump into the same issue I had. - - * **ISSUE** `#28248`_: (`0xf10e`_) conventions/formula.rst: "Gather external data" suggests unavailable jinja functionality (refs: `#28280`_) - -@@ -976,7 +976,7 @@ Changelog for v2015.5.6..v2015.5.7 - - * 579f2646ba .. versionadded:: 2015.5.6 - -- * cbaf46e066 python <2.7 compability (pylint issue) -+ * cbaf46e066 python <2.7 compatibility (pylint issue) - - * ecde499478 s/bin/b to avoid confusion with bin() - -diff --git a/doc/topics/releases/2015.5.9.rst b/doc/topics/releases/2015.5.9.rst -index 7b7576fab4..f2cacd0b63 100644 ---- a/doc/topics/releases/2015.5.9.rst -+++ b/doc/topics/releases/2015.5.9.rst -@@ -66,7 +66,7 @@ Changelog for v2015.5.8..v2015.5.9 - * **PR** `#30127`_: (`jsutton`_) Updating documentation and example minion config for random_master/master_shuffle. - @ *2016-01-04 19:30:50 UTC* - -- * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documenation-for-random_master -+ * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documentation-for-random_master - - * 01dbf385ef Adding random_master to reference and updating master_shuffle. Adding master_shuffle to the minion example config file as it is needed for multi-master PKI. - -diff --git a/doc/topics/releases/2015.8.1.rst b/doc/topics/releases/2015.8.1.rst -index 1dc5d55f5b..eb125aac5a 100644 ---- a/doc/topics/releases/2015.8.1.rst -+++ b/doc/topics/releases/2015.8.1.rst -@@ -199,7 +199,7 @@ Changelog for v2015.8.0..v2015.8.1 - - * 68d784c3dd Merge pull request `#27472`_ from cachedout/fix_27447 - -- * 5e745ad6da Change recommeded schema for data field in mysql event table -+ * 5e745ad6da Change recommended schema for data field in mysql event table - - * ee6e0ed057 Merge pull request `#27468`_ from cachedout/fix_27351 - -@@ -235,7 +235,7 @@ Changelog for v2015.8.0..v2015.8.1 - - * ed6207a438 Merge pull request `#27419`_ from rallytime/fix-9856 - -- * 551396564a Ammend error log to include multiple tips for troubleshooting. -+ * 551396564a Amend error log to include multiple tips for troubleshooting. - - * 73fa89edf7 Merge pull request `#27426`_ from rallytime/fix-16753 - -@@ -245,7 +245,7 @@ Changelog for v2015.8.0..v2015.8.1 - - * 39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. - -- * de2f9234d3 Use correct default for bandwith -+ * de2f9234d3 Use correct default for bandwidth - - * 42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. - -@@ -669,7 +669,7 @@ Changelog for v2015.8.0..v2015.8.1 - - * ed18384108 Merge pull request `#7`_ from jtand/cloud-logging-eight - -- * a6c1d0b408 Fixed a bug where logging_command wasnt set as a key in a couple spots -+ * a6c1d0b408 Fixed a bug where logging_command wasn't set as a key in a couple spots - - * 8bb7cb7ff4 Use correct indexes - -@@ -1556,12 +1556,12 @@ Changelog for v2015.8.0..v2015.8.1 - - * 7e35b13022 Turned multiprocessing on - --* **PR** `#27086`_: (`techhat`_) Document develoment of SPM loader modules -+* **PR** `#27086`_: (`techhat`_) Document development of SPM loader modules - @ *2015-09-13 04:52:55 UTC* - - * c78d833540 Merge pull request `#27086`_ from techhat/spmdevdocs - -- * ee0c8955dd Document develoment of SPM loader modules -+ * ee0c8955dd Document development of SPM loader modules - - * **ISSUE** `#23125`_: (`bemeyert`_) Elasticsearch as master_job_cache throws critical (refs: `#26941`_) - -diff --git a/doc/topics/releases/2015.8.11.rst b/doc/topics/releases/2015.8.11.rst -index 9c68707cfb..3c1c39a63f 100644 ---- a/doc/topics/releases/2015.8.11.rst -+++ b/doc/topics/releases/2015.8.11.rst -@@ -449,7 +449,7 @@ Changelog for v2015.8.10..v2015.8.11 - - * **PR** `#33599`_: (`lomeroe`_) Fix s3 large file download (refs: `#33681`_) - --* **ISSUE** `#34213`_: (`terminalmage`_) gitfs w/pygit2 - corner case, traceback with short hexidecimal environment names (refs: `#34218`_) -+* **ISSUE** `#34213`_: (`terminalmage`_) gitfs w/pygit2 - corner case, traceback with short hexadecimal environment names (refs: `#34218`_) - - * **ISSUE** `#34212`_: (`terminalmage`_) gitfs: commit SHAs no longer available as fileserver environments (refs: `#34218`_) - -@@ -1080,7 +1080,7 @@ Changelog for v2015.8.10..v2015.8.11 - - * 6b6febb211 unit tests for rpm.checksum() and zypper.download() - --* **ISSUE** `#33319`_: (`ghost`_) Salt interpets jinja syntax in contents pillar (refs: `#33513`_) -+* **ISSUE** `#33319`_: (`ghost`_) Salt interprets jinja syntax in contents pillar (refs: `#33513`_) - - * **PR** `#33513`_: (`rallytime`_) Add a section to the jinja docs about escaping jinja - @ *2016-05-26 14:24:58 UTC* -@@ -1143,14 +1143,14 @@ Changelog for v2015.8.10..v2015.8.11 - - * 68d8050cb8 Fix diskusage beacon - --* **PR** `#33465`_: (`meaksh`_) jobs.exit_success allow to check if a job has executed and exit successfully -+* **PR** `#33465`_: (`meaksh`_) jobs.exit_success allow checking if a job has executed and exit successfully - @ *2016-05-25 16:52:53 UTC* - - * 3bfb6bf719 Merge pull request `#33465`_ from meaksh/check-if-job-returns-successfully-2015.8 - - * 9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() - -- * 7ba40c4f31 jobs.exit_success allow to check if a job has executed and exit successfully -+ * 7ba40c4f31 jobs.exit_success allow checking if a job has executed and exit successfully - - * **PR** `saltstack/salt-jenkins#175`_: (`justinta`_) Adding back shade to setup states (refs: `#33487`_) - -@@ -1285,7 +1285,7 @@ Changelog for v2015.8.10..v2015.8.11 - - * **PR** `#33421`_: (`abednarik`_) Documentation update in file.serialize. - -- * **PR** `#33398`_: (`lvg01`_) Fix LVM parameter devices as a pure list. Comma seperated lists are c… -+ * **PR** `#33398`_: (`lvg01`_) Fix LVM parameter devices as a pure list. Comma separated lists are c… - - * **PR** `#33406`_: (`rallytime`_) Back-port `#33387`_ to 2015.8 - -diff --git a/doc/topics/releases/2015.8.12.rst b/doc/topics/releases/2015.8.12.rst -index ed93299020..585b93622d 100644 ---- a/doc/topics/releases/2015.8.12.rst -+++ b/doc/topics/releases/2015.8.12.rst -@@ -288,7 +288,7 @@ Changelog for v2015.8.11..v2015.8.12 - - * 8a5b47b5d7 Collect all error data from the wfuncs call - -- * 11864c31b7 supress a stack trace to show clean ssh error -+ * 11864c31b7 suppress a stack trace to show clean ssh error - - * 9fbfa282fa wow this solves an issue! - -@@ -461,7 +461,7 @@ Changelog for v2015.8.11..v2015.8.12 - - * e1fcb8311d Put pkg.latest_version in try/except structure Move refreshed or refresh to different spot (just for code tidyness) - -- * e0b6261659 changed name of varibale 'refreshed' to 'was_refreshed' -+ * e0b6261659 changed name of variable 'refreshed' to 'was_refreshed' - - * 340110b4b4 Move check for rtag to outermost-nesting in function - -@@ -744,7 +744,7 @@ Changelog for v2015.8.11..v2015.8.12 - - * 9c803d05a5 Add output_file option to master config docs - --* **ISSUE** `saltstack/salt#32276`_: (`javicacheiro`_) pkg.installed using sources from master fails with file not found after first succesful run (refs: `#34689`_) -+* **ISSUE** `saltstack/salt#32276`_: (`javicacheiro`_) pkg.installed using sources from master fails with file not found after first successful run (refs: `#34689`_) - - * **PR** `#34689`_: (`Azidburn`_) fix second run problems with pkg.installed using sources - @ *2016-07-15 21:19:39 UTC* -diff --git a/doc/topics/releases/2015.8.2.rst b/doc/topics/releases/2015.8.2.rst -index aa69c5e50a..a849c9ba43 100644 ---- a/doc/topics/releases/2015.8.2.rst -+++ b/doc/topics/releases/2015.8.2.rst -@@ -837,65 +837,65 @@ Changelog for v2015.8.1..v2015.8.2 - - * ec924e8410 Merge pull request `#28560`_ from bdrung/2015.8 - -- * 89dcb66310 Fix the wrong "allow to do" phrase -+ * 89dcb66310 Fix "allow one to do" phrase - -- * 859b6b46a6 Fix typo an nonexistant -> nonexistent -+ * 859b6b46a6 Fix typo of nonexistent - -- * 66921cc61e Fix typo an succesfully -> successfully -+ * 66921cc61e Fix typo of successfully - -- * c1e3ef7c8d Fix typo an explicitely -> explicitly -+ * c1e3ef7c8d Fix typo of explicitly - -- * 029a95398c Fix typo an superflous -> superfluous -+ * 029a95398c Fix typo of superfluous - -- * 026c215933 Fix typo an unecessary -> unnecessary -+ * 026c215933 Fix typo of unnecessary - -- * 5f7fc5f94b Fix typo an edditable -> editable -+ * 5f7fc5f94b Fix typo of editable - -- * 0b768944c2 Fix typo an deamon -> daemon -+ * 0b768944c2 Fix typo of daemon - -- * 5af49881d7 Fix typo an completly -> completely -+ * 5af49881d7 Fix typo of completely - - * 14d2a16f74 Fix typos of compatibility - -- * 46a5a9b073 Fix typo an suppored -> supported -+ * 46a5a9b073 Fix typo of supported - -- * abc490a78e Fix typo an usefull -> useful -+ * abc490a78e Fix typo of useful - -- * ddd412180c Fix typo an targetting -> targeting -+ * ddd412180c Fix typo of targeting - -- * 610a6a77ae Fix typo an verison -> version -+ * 610a6a77ae Fix typo of version - -- * e0a5d46a1e Fix typo an seperated -> separated -+ * e0a5d46a1e Fix typo of separated - -- * 7f11cfd5e1 Fix typo an helpfull -> helpful -+ * 7f11cfd5e1 Fix typo of helpful - - * 2e9b520d84 Fix typos of omitted - -- * 3029f64481 Fix typo an compatbility -> compatibility -+ * 3029f64481 Fix typo of compatibility - -- * 470e82f17f Fix typo an dictionnary -> dictionary -+ * 470e82f17f Fix typo of dictionary - -- * 5843c7aa24 Fix typo an optionnal -> optional -+ * 5843c7aa24 Fix typo of optional - -- * 730d0f95e7 Fix typo an transfered -> transferred -+ * 730d0f95e7 Fix typo of transferred - -- * c7e7884de2 Fix typo an recieved -> received -+ * c7e7884de2 Fix typo of received - -- * 50eea287f3 Fix typo an managment -> management -+ * 50eea287f3 Fix typo of management - - * cb01da81c6 Fix typos of parameter - -- * 45fcc7d339 Fix typo an dont -> don't -+ * 45fcc7d339 Fix typo of don't - -- * 3624935d32 Fix typo an other -> another -+ * 3624935d32 Fix typo of another - -- * d16afe2607 Fix typo sofwares -> software -+ * d16afe2607 Fix typo of software - -- * b9b7cbe525 Fix typo sofware -> software -+ * b9b7cbe525 Fix typo of software - - * 8edd2c1add Fix typos of dependency - -- * 3a5e2e3437 Fix typo documention -> documentation -+ * 3a5e2e3437 Fix typo of documentation - - * **ISSUE** `#28528`_: (`schlagify`_) timezone.system error: CommandExecutionError: Failed to parse timedatectl output, this is likely a bug (refs: `#28550`_) - -@@ -1118,7 +1118,7 @@ Changelog for v2015.8.1..v2015.8.2 - - * b1f4a2bdf4 i think i changed the wrong header, updated to fix - -- * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. -+ * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands won't bump into the same issue I had. - - * e3eff9b909 Merge pull request `#28280`_ from 0xf10e/patch-1 - -@@ -3045,7 +3045,7 @@ Changelog for v2015.8.1..v2015.8.2 - - * 579f2646ba .. versionadded:: 2015.5.6 - -- * cbaf46e066 python <2.7 compability (pylint issue) -+ * cbaf46e066 python <2.7 compatibility (pylint issue) - - * ecde499478 s/bin/b to avoid confusion with bin() - -diff --git a/doc/topics/releases/2015.8.4.rst b/doc/topics/releases/2015.8.4.rst -index 019815d987..6aa4e43c75 100644 ---- a/doc/topics/releases/2015.8.4.rst -+++ b/doc/topics/releases/2015.8.4.rst -@@ -732,14 +732,14 @@ Changelog for v2015.8.3..v2015.8.4 - - * a7c2ad5505 Fix issue where pyVmomi 6.0.0 raises SSL Error for systems using Python2.7+ - --* **PR** `#30354`_: (`anlutro`_) Make sure all ignore_missing SLSes are catched -+* **PR** `#30354`_: (`anlutro`_) Make sure all ignore_missing SLSes are caught - @ *2016-01-14 16:24:19 UTC* - - * **PR** `#19429`_: (`ryan-lane`_) Add new ignore_missing option to pillar top (refs: `#30354`_) - - * 7ee61f0d62 Merge pull request `#30354`_ from alprs/fix-pillar_ignore_missing - -- * 2f662bbc8d make sure *all* ignore_missing slses are catched -+ * 2f662bbc8d make sure *all* ignore_missing slses are caught - - * **PR** `#30356`_: (`nmadhok`_) Adding code author - @ *2016-01-14 16:23:08 UTC* -@@ -1037,7 +1037,7 @@ Changelog for v2015.8.3..v2015.8.4 - - * 0877b33026 Fixed some linting issues - -- * 8ec36497a1 Added note about systemd and uncleanshutdown. Also fixed line lenght of comments to max 80 characters as per PEP0008 -+ * 8ec36497a1 Added note about systemd and uncleanshutdown. Also fixed line length of comments to max 80 characters as per PEP0008 - - * a50428d02c On an unclean shutdown, if oncleanshutdown is given a path, an keyy:value of shutdown:unclean is added to the returned data. The documentation states that the key should be 'uncleanshutdown' and that the value should either be True or False. This is fixed in the code - -@@ -1281,7 +1281,7 @@ Changelog for v2015.8.3..v2015.8.4 - - * 56544a77f6 Update user home event when createhome is set to False - -- * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documenation-for-random_master -+ * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documentation-for-random_master - - * 01dbf385ef Adding random_master to reference and updating master_shuffle. Adding master_shuffle to the minion example config file as it is needed for multi-master PKI. - -@@ -1619,12 +1619,12 @@ Changelog for v2015.8.3..v2015.8.4 - - * 0bb83e51aa Updated Cloud msic section. - --* **PR** `#30029`_: (`terminalmage`_) git.latest: Fix handling of nonexistant branches -+* **PR** `#30029`_: (`terminalmage`_) git.latest: Fix handling of nonexistent branches - @ *2015-12-28 19:39:29 UTC* - -- * a5f7d9c2fc Merge pull request `#30029`_ from terminalmage/git.latest-nonexistant-branch -+ * a5f7d9c2fc Merge pull request `#30029`_ from terminalmage/git.latest-nonexistent-branch - -- * 0b95894c9f git.latest: Fix handling of nonexistant branches -+ * 0b95894c9f git.latest: Fix handling of nonexistent branches - - * **PR** `#30016`_: (`anlutro`_) Properly normalize locales in locale.gen_locale - @ *2015-12-28 15:33:48 UTC* -@@ -1834,7 +1834,7 @@ Changelog for v2015.8.3..v2015.8.4 - - * 3b7f5540ec Add vSphere module to doc ref module tree - --* **ISSUE** `#29751`_: (`ether42`_) mod_hostname behavior is systemd dependant (refs: `#29767`_) -+* **ISSUE** `#29751`_: (`ether42`_) mod_hostname behavior is systemd dependent (refs: `#29767`_) - - * **PR** `#29767`_: (`abednarik`_) Hosts file update in mod_hostname. - @ *2015-12-17 18:31:18 UTC* -@@ -2026,7 +2026,7 @@ Changelog for v2015.8.3..v2015.8.4 - - * 7c50533d3f Merge pull request `#29683`_ from rallytime/vsan_fixes - -- * afc003079e Catch more specifc error to pass the error message through elegantly. -+ * afc003079e Catch more specific error to pass the error message through elegantly. - - * **PR** `#29687`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 - @ *2015-12-15 18:38:46 UTC* -@@ -2209,9 +2209,9 @@ Changelog for v2015.8.3..v2015.8.4 - - * b96d8ff1d9 Minor update to release notes for missing fix - -- * e72354aac4 Fix typo specfic -> specific -+ * e72354aac4 Fix typo of specific - -- * 5708355762 Fix typo comparsion -> comparison -+ * 5708355762 Fix typo of comparison - - * **PR** `#29540`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 - @ *2015-12-08 21:27:01 UTC* -@@ -2545,7 +2545,7 @@ Changelog for v2015.8.3..v2015.8.4 - - * 8fe39d0ef8 Merge pull request `#29400`_ from twangboy/fix_19332 - -- * 7bdddaca53 Fixed grammer -+ * 7bdddaca53 Fixed grammar - - * d965d00a09 Fix `#19332`_ - -diff --git a/doc/topics/releases/2015.8.8.rst b/doc/topics/releases/2015.8.8.rst -index 9b7eab82d1..bfb64a5f0d 100644 ---- a/doc/topics/releases/2015.8.8.rst -+++ b/doc/topics/releases/2015.8.8.rst -@@ -92,7 +92,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * d661081016 Lint. - -- * 59e0a6f923 Dont add this file -+ * 59e0a6f923 Don't add this file - - * c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py - -@@ -552,7 +552,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * ec90294442 Merge pull request `#31733`_ from jacobhammons/cloud-docs - -- * 209c641a41 Made udpates as suggested by @rallytime -+ * 209c641a41 Made updates as suggested by @rallytime - - * 26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst) added new intro that explains the salt cloud configuration files added an inheritance and minion startup state example to topics/cloud/config.rst - -@@ -594,12 +594,12 @@ Changelog for v2015.8.7..v2015.8.8 - - * 1349bdd2e8 fix influxdb user functionality for version 0.9+ - --* **PR** `#31743`_: (`Talkless`_) Fix parentheses missmatch in documentation -+* **PR** `#31743`_: (`Talkless`_) Fix parentheses mismatch in documentation - @ *2016-03-08 18:01:23 UTC* - - * c0868307df Merge pull request `#31743`_ from Talkless/patch-1 - -- * 26ff46dbc6 Fix parenthesis missmatch in documentation -+ * 26ff46dbc6 Fix parenthesis mismatch in documentation - - * **PR** `#31162`_: (`isbm`_) Remove MD5 digest from everywhere and default to SHA256 - @ *2016-03-07 19:11:36 UTC* -@@ -642,7 +642,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * f0d931f4d0 Use hash_type configuration for the Cloud - -- * 95cb59dec7 Set defalt hash as SHA1 in config and explain why. -+ * 95cb59dec7 Set default hash as SHA1 in config and explain why. - - * 8f9543c292 Set config hash_type to SHA1 - -@@ -1518,7 +1518,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * 274e6467be do not change kwargs in refresh while checking a value - -- * 644b14c273 simplify checking the refresh paramater -+ * 644b14c273 simplify checking the refresh parameter - - * db0e0de2fd add refresh option to more functions - -@@ -1544,7 +1544,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * **ISSUE** `#28004`_: (`warden`_) dockerng.image_present should allow public repository pulling by default (refs: `#31354`_) - --* **PR** `#31354`_: (`ticosax`_) [dockerng] Dont require auth for all registries -+* **PR** `#31354`_: (`ticosax`_) [dockerng] Don't require auth for all registries - @ *2016-02-20 05:45:10 UTC* - - * 174ee10fc2 Merge pull request `#31354`_ from ticosax/dont-require-auth-for-all-registries -@@ -1795,7 +1795,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * 29e3dd091d Merge pull request `#31271`_ from rallytime/bp-30689 - -- * 3dae79d516 fix nested grains always show update due to __grains__.get() not supporting the ":" seperator -+ * 3dae79d516 fix nested grains always show update due to __grains__.get() not supporting the ":" separator - - * **ISSUE** `#30461`_: (`jfindlay`_) update documentation on bootstrap-supported platforms (refs: `#31255`_) - -@@ -1988,7 +1988,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * 47ecb7a150 include all ips in public_ips or private_ips - -- * b2e8202f5d dont exit on a missing server -+ * b2e8202f5d don't exit on a missing server - - * 8ad1ee6db4 clean up references to access_ip extra network - -@@ -2533,49 +2533,49 @@ Changelog for v2015.8.7..v2015.8.8 - - * 4372851ad9 Merge pull request `#30895`_ from bdrung/2015.8 - -- * 708f2ff8ea Fix typo reponse -> response -+ * 708f2ff8ea Fix typo of response - -- * 72c4eab6d7 Fix typo propogate -> propagate -+ * 72c4eab6d7 Fix typo of propagate - -- * 4912e365cb Fix typo directores -> directories -+ * 4912e365cb Fix typo of directories - -- * 74c8aba03e Fix typo exeption -> exception -+ * 74c8aba03e Fix typo of exception - - * 4692d84b07 Fix typos of improvement - -- * 213fc2d858 Fix typo occuring -> occurring -+ * 213fc2d858 Fix typo of occurring - -- * fe6124003b Fix typo nonexistant -> nonexistent -+ * fe6124003b Fix typo of nonexistent - -- * 56ce7479b1 Fix typo catched -> caught -+ * 56ce7479b1 Fix typo of caught - -- * 821e690e65 Fix typo develoment -> development -+ * 821e690e65 Fix typo of development - -- * b51279e086 Fix typo overide -> override -+ * b51279e086 Fix typo of override - -- * 4f2f04ea7d Fix typo relevent -> relevant -+ * 4f2f04ea7d Fix typo of relevant - -- * fe8be562c5 Fix typo existance -> existence -+ * fe8be562c5 Fix typo of existence - -- * 4a2f4de1a8 Fix typo accross -> across -+ * 4a2f4de1a8 Fix typo of across - -- * 9ae50c993e Fix typo Lenth -> Length -+ * 9ae50c993e Fix typo of Length - -- * 20e79981e1 Fix typo preferrably -> preferably -+ * 20e79981e1 Fix typo of preferably - -- * f8d9f608dd Fix typo addres -> address -+ * f8d9f608dd Fix typo of address - -- * a7f12a13f0 Fix typo keywork -> keyword -+ * a7f12a13f0 Fix typo of keyword - -- * bf92c3663b Fix typo formating -> formatting -+ * bf92c3663b Fix typo of formatting - -- * ca4450d881 Fix typo wont -> won't -+ * ca4450d881 Fix typo of won't - -- * cd72b12161 Fix typo thats -> that's -+ * cd72b12161 Fix typo of that's - -- * 6db9724ec7 Fix typo doesnt -> doesn't -+ * 6db9724ec7 Fix typo of doesn't - -- * 58d46a7e98 Fix typo certficate -> certificate -+ * 58d46a7e98 Fix typo of certificate - - * **ISSUE** `#30887`_: (`anlutro`_) salt-ssh fails on import msgpack - 2015.8 (refs: `#30889`_) - -@@ -3199,7 +3199,7 @@ Changelog for v2015.8.7..v2015.8.8 - - * 57b7e6cc93 Add glance state to list of state modules - --* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0 (refs: `#20972`_, `#30591`_) -+* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0 (refs: `#20972`_, `#30591`_) - - * **PR** `#30618`_: (`rallytime`_) Back-port `#30591`_ to 2015.8 - @ *2016-01-25 23:55:20 UTC* -diff --git a/doc/topics/releases/2015.8.9.rst b/doc/topics/releases/2015.8.9.rst -index 35133c63e9..c32b4cac47 100644 ---- a/doc/topics/releases/2015.8.9.rst -+++ b/doc/topics/releases/2015.8.9.rst -@@ -114,7 +114,7 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * **PR** `#33224`_: (`rallytime`_) Make note of files that begin with '_' in master.d or minion.d dirs - --* **ISSUE** `#31975`_: (`rajvidhimar`_) Docstrings not reflected in the salt documenation. (refs: `#33150`_) -+* **ISSUE** `#31975`_: (`rajvidhimar`_) Docstrings not reflected in the salt documentation. (refs: `#33150`_) - - * **PR** `#33150`_: (`rallytime`_) Gate jnpr imports in salt.proxy.junos.py - -@@ -194,7 +194,7 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * **PR** `#33142`_: (`cachedout`_) Hash fileclients by opts - --* **ISSUE** `#22142`_: (`multani`_) State `acl.present` doesn't allow to set "default" ACLs (refs: `#31769`_) -+* **ISSUE** `#22142`_: (`multani`_) State `acl.present` doesn't allow setting "default" ACLs (refs: `#31769`_) - - * **PR** `#33139`_: (`rallytime`_) Back-port `#31769`_ to 2015.8 - -@@ -677,7 +677,7 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * **ISSUE** `#32229`_: (`seanjnkns`_) 2015.8.8.2: pkg.installed fails to update packages with epoch (refs: `#32563`_) - -- * **PR** `#32563`_: (`terminalmage`_) yumpkg: Ignore epoch in version comparison for explict versions without an epoch -+ * **PR** `#32563`_: (`terminalmage`_) yumpkg: Ignore epoch in version comparison for explicit versions without an epoch - - * **PR** `#32640`_: (`nmadhok`_) [2015.8] - Fixing critical bug to remove only the specified Host instead of the entire Host cluster - -@@ -902,12 +902,12 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * **ISSUE** `#31632`_: (`zieba88`_) salt-cloud map parallel provisioning -P option failed on 2015.8.5 (refs: `#32425`_) - --* **PR** `#32425`_: (`cachedout`_) Fix salt-cloud paralell provisioning -+* **PR** `#32425`_: (`cachedout`_) Fix salt-cloud parallel provisioning - @ *2016-04-07 21:52:06 UTC* - - * c07e02bacb Merge pull request `#32425`_ from cachedout/issue_31632 - -- * 127c0829ee Fix salt-cloud paralell provisioning -+ * 127c0829ee Fix salt-cloud parallel provisioning - - * **PR** `#32323`_: (`mcalmer`_) fix sorting by latest version when called with an attribute - @ *2016-04-07 06:24:35 UTC* -@@ -1128,37 +1128,37 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * f16e332b3a Merge pull request `#32326`_ from bdrung/fix-typos - -- * a7db152333 Fix typo dont -> don't -+ * a7db152333 Fix typo of don't - -- * d4c037301b Fix typo missmatch -> mismatch -+ * d4c037301b Fix typo of mismatch - -- * 70dba70ff0 Fix typo additonal -> addition -+ * 70dba70ff0 Fix typo of addition - -- * 68c60903aa Fix typo mutliple -> multiple -+ * 68c60903aa Fix typo of multiple - -- * 0f2c779b90 Fix typo fucntion -> function -+ * 0f2c779b90 Fix typo of function - -- * 0c9e4c8c80 Fix typo avilable -> available -+ * 0c9e4c8c80 Fix typo of available - -- * 920abe2ec7 Fix typo formated -> formatted -+ * 920abe2ec7 Fix typo of formatted - -- * e56dd4bb23 Fix typo ommitted -> omitted -+ * e56dd4bb23 Fix typo of omitted - -- * f99e6f1f13 Fix typo ouptut -> output -+ * f99e6f1f13 Fix typo of output - -- * d3804094f2 Fix typo wether -> whether -+ * d3804094f2 Fix typo of whether - -- * 538fb6fae2 Fix typo perfomed -> performed -+ * 538fb6fae2 Fix typo of performed - -- * db7af998ee Fix typo santized -> sanitized -+ * db7af998ee Fix typo of sanitized - -- * d7af01da2b Fix typo coresponding -> corresponding -+ * d7af01da2b Fix typo of corresponding - -- * 301e78b5be Fix typo vaules -> values -+ * 301e78b5be Fix typo of values - - * 8cada9573f Fix typos of retrieve - -- * b484d6f9c9 Fix typo directorys -> directories -+ * b484d6f9c9 Fix typo of directories - - * **PR** `#32300`_: (`twangboy`_) Add documentation to disable winrepo/winrepo_ng - @ *2016-04-01 21:23:09 UTC* -@@ -1328,7 +1328,7 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * bf59f06733 Merge pull request `#32217`_ from jacobhammons/dot8 - -- * 596444e2b4 2015.8.8.2 release notes Adds banner notifiying user when they are viewing release notes for an old release -+ * 596444e2b4 2015.8.8.2 release notes Adds banner notifying user when they are viewing release notes for an old release - - * **ISSUE** `#31844`_: (`Talkless`_) slspath is not documented (refs: `#32197`_) - -@@ -1534,9 +1534,9 @@ Changelog for v2015.8.8.2..v2015.8.9 - - * d18b4be80b remove whitespace end of line 186:q - -- * d2b89c85ad fix formating -+ * d2b89c85ad fix formatting - -- * 103cee9e29 cleaned up formating -+ * 103cee9e29 cleaned up formatting - - * 7a4d7f0bff added whitespace - -diff --git a/doc/topics/releases/2016.11.2.rst b/doc/topics/releases/2016.11.2.rst -index f6db00f49c..2733a81d2e 100644 ---- a/doc/topics/releases/2016.11.2.rst -+++ b/doc/topics/releases/2016.11.2.rst -@@ -179,9 +179,9 @@ Changelog for v2016.11.1..v2016.11.2 - - * fd2ee7db30 Add some simple unit tests for salt.config.api_config function - -- * 3d2fefc83b Make sure the pidfile and log_file values are overriden by api opts -+ * 3d2fefc83b Make sure the pidfile and log_file values are overridden by api opts - -- * 1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts -+ * 1f6b540e46 Make sure the pidfile and log_file values are overridden by api opts - - * 04d307f917 salt-api no longer forces the default timeout - -@@ -566,7 +566,7 @@ Changelog for v2016.11.1..v2016.11.2 - - * 26fae54f5b network.ifacestartswith throws exception on Solaris-like platforms - --* **ISSUE** `#37027`_: (`sjorge`_) Solaris FQDN/UQDN and documentation/consistancy (refs: `#38615`_) -+* **ISSUE** `#37027`_: (`sjorge`_) Solaris FQDN/UQDN and documentation/consistency (refs: `#38615`_) - - * **PR** `#38615`_: (`sjorge`_) add note related to issue `#37027`_ - @ *2017-01-06 16:38:34 UTC* -@@ -772,7 +772,7 @@ Changelog for v2016.11.1..v2016.11.2 - - * 68d5475c1f Fixing Snapper unit tests for SUBVOLUME support - -- * e9919a913f Removing posible double '/' from the file paths -+ * e9919a913f Removing possible double '/' from the file paths - - * 8b4f87f226 Updating and fixing the documentation - -@@ -1202,14 +1202,14 @@ Changelog for v2016.11.1..v2016.11.2 - - * 6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (`#38256`_) - --* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleteed (refs: `#38232`_) -+* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleted (refs: `#38232`_) - --* **PR** `#38232`_: (`rallytime`_) Strip final 'e' in key cmd to correct "deleteed" misspelling -+* **PR** `#38232`_: (`rallytime`_) Strip final 'e' in key cmd to correct "deleted" misspelling - @ *2016-12-15 10:38:49 UTC* - - * 0af343e71f Merge pull request `#38232`_ from rallytime/fix-38231 - -- * 26e1ee3650 Strip final 'e' in key cmd to correct "deleteed" misspelling -+ * 26e1ee3650 Strip final 'e' in key cmd to correct "deleted" misspelling - - * **ISSUE** `#38200`_: (`sebw`_) selinux.mode doesn't return any output and doesn't persist (refs: `#38236`_) - -diff --git a/doc/topics/releases/2016.11.3.rst b/doc/topics/releases/2016.11.3.rst -index ccf7a293fd..dab70427a4 100644 ---- a/doc/topics/releases/2016.11.3.rst -+++ b/doc/topics/releases/2016.11.3.rst -@@ -355,7 +355,7 @@ Changelog for v2016.11.2..v2016.11.3 - - * 52440416ca Merge pull request `#39221`_ from lvg01/fix-bug-39220 - -- * e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ -+ * e8a41d6341 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ - - * a4b169e0bd Fixed wrong logic, fixes `#39220`_ - -@@ -441,7 +441,7 @@ Changelog for v2016.11.2..v2016.11.3 - - * 624f25b78d Fix for `#38697`_ - --* **ISSUE** `#39269`_: (`alexharrington`_) Remount forced with lizardfs fuse filesystem due to device missmatch (refs: `#39276`_) -+* **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`_) - -@@ -672,7 +672,7 @@ Changelog for v2016.11.2..v2016.11.3 - - * 97521b3468 Second attempt to fix prepending of root_dir to paths - -- * 6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes `#39118`_ (`#39131`_) -+ * 6ffeda3ee5 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_) - - * 646b9ea4e5 Don't abort pillar.get with merge=True if default is None (`#39116`_) - -@@ -1111,7 +1111,7 @@ Changelog for v2016.11.2..v2016.11.3 - - * fbc4d2a2c4 reactor: ensure glob_ref is a string - -- * 2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path -+ * 2e443d79a3 cp.cache_file: add note re: return for nonexistent salt:// path - - * e9ebec4d80 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 2e0c6a2215..50f45785e7 100644 ---- a/doc/topics/releases/2016.11.4.rst -+++ b/doc/topics/releases/2016.11.4.rst -@@ -864,7 +864,7 @@ Changelog for v2016.11.3..v2016.11.4 - - * d68067f1d7 Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes - -- * 4f23a23ca8 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`. -+ * 4f23a23ca8 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`. - - * 9d0f94eeba Fixed unnecessary API changes introduced with suggested changes. - -@@ -1378,7 +1378,7 @@ Changelog for v2016.11.3..v2016.11.4 - - * 116201f345 Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - -- * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistant user -+ * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistent user - - * a01b52b9a3 Merge pull request `#40090`_ from rallytime/bp-40056 - -@@ -1414,9 +1414,9 @@ Changelog for v2016.11.3..v2016.11.4 - - * 8dcffc7751 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner - -- * 9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' -+ * 9f5c3b7dcd Allows one to set custom timeouts for 'manage.up' and 'manage.status' - -- * 2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs -+ * 2102d9c75c Allows one to set 'timeout' and 'gather_job_timeout' via kwargs - - * 22fc5299a2 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing - -@@ -1444,9 +1444,9 @@ Changelog for v2016.11.3..v2016.11.4 - - * e73a1d0e54 Merge pull request `#40072`_ from meaksh/2016.11-handling-timeouts-for-manage.up-runner - -- * 40246d3723 Allows to set custom timeouts for 'manage.up' and 'manage.status' -+ * 40246d3723 Allows one to set custom timeouts for 'manage.up' and 'manage.status' - -- * ad232fdc01 Allows to set 'timeout' and 'gather_job_timeout' via kwargs -+ * ad232fdc01 Allows one to set 'timeout' and 'gather_job_timeout' via kwargs - - * **PR** `#40045`_: (`terminalmage`_) Fix error when chhome is invoked by user.present state in Windows - @ *2017-03-15 19:00:41 UTC* -@@ -1490,7 +1490,7 @@ Changelog for v2016.11.3..v2016.11.4 - - * 0c61d064ad Merge pull request `#39980`_ from vutny/cmd-run-state-bg - -- * a81dc9dfc1 [2016.3] Allow to use `bg` kwarg for `cmd.run` state function -+ * a81dc9dfc1 [2016.3] Allow using `bg` kwarg for `cmd.run` state function - - * b042484455 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version - -@@ -1808,14 +1808,14 @@ Changelog for v2016.11.3..v2016.11.4 - - * 6539dbdbca Do not use name resolving for --notrim check - --* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleteed (refs: `#39799`_) -+* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleted (refs: `#39799`_) - --* **PR** `#39799`_: (`Ch3LL`_) Fix deleteed message when key is deleted -+* **PR** `#39799`_: (`Ch3LL`_) Fix deleted message when key is deleted - @ *2017-03-03 05:17:43 UTC* - - * d0440e2a2a Merge pull request `#39799`_ from Ch3LL/fix_salt_key_msg - -- * 8346682cf7 Fix deleteed message when key is deleted -+ * 8346682cf7 Fix deleted message when key is deleted - - * **ISSUE** `#38962`_: (`gstachowiak`_) Broken /jobs in salt-api in salt 2016.11.1 (Carbon) (refs: `#39472`_) - -@@ -2029,12 +2029,12 @@ Changelog for v2016.11.3..v2016.11.4 - - * **ISSUE** `#38836`_: (`toanctruong`_) file.managed with S3 Source errors out with obscure message (refs: `#39609`_, `#39589`_) - --* **PR** `#39609`_: (`gtmanfred`_) intialize the Client stuff in FSClient -+* **PR** `#39609`_: (`gtmanfred`_) initialize the Client stuff in FSClient - @ *2017-02-24 18:50:55 UTC* - - * 0bc6027e68 Merge pull request `#39609`_ from gtmanfred/2016.11 - -- * 0820620ef8 intialize the Client stuff in FSClient -+ * 0820620ef8 initialize the Client stuff in FSClient - - * **PR** `#39615`_: (`skizunov`_) Bonjour/Avahi beacons: Make sure TXT record length is valid - @ *2017-02-24 18:47:05 UTC* -diff --git a/doc/topics/releases/2016.11.6.rst b/doc/topics/releases/2016.11.6.rst -index 413a99673b..e770d5b9b4 100644 ---- a/doc/topics/releases/2016.11.6.rst -+++ b/doc/topics/releases/2016.11.6.rst -@@ -564,7 +564,7 @@ Changelog for v2016.11.5..v2016.11.6 - - * ef8e3ef569 Update win_pki.py - --* **PR** `#41557`_: (`dmurphy18`_) Add symbolic link for salt-proxy service similar to other serivce files -+* **PR** `#41557`_: (`dmurphy18`_) Add symbolic link for salt-proxy service similar to other service files - @ *2017-06-06 17:13:52 UTC* - - * 3335fcbc7d Merge pull request `#41557`_ from dmurphy18/fix-proxy-service -@@ -809,7 +809,7 @@ Changelog for v2016.11.5..v2016.11.6 - - * 66ab1e5184 Re-adding neutron dependency check - -- * cce07eefc2 Updating Neutron module to suport KeystoneAuth -+ * cce07eefc2 Updating Neutron module to support KeystoneAuth - - * **ISSUE** `#34460`_: (`Ch3LL`_) Receive an error when using salt-api to call a runner (refs: `#41409`_) - -@@ -1001,7 +1001,7 @@ Changelog for v2016.11.5..v2016.11.6 - * **PR** `#41319`_: (`lomeroe`_) backport `#41307`_ to 2016.11, properly pack version numbers into single - @ *2017-05-19 18:25:00 UTC* - -- * **PR** `#41307`_: (`lomeroe`_) properly pack/unpack the verison numbers into a number (refs: `#41319`_) -+ * **PR** `#41307`_: (`lomeroe`_) properly pack/unpack the version numbers into a number (refs: `#41319`_) - - * 140b0427e1 Merge pull request `#41319`_ from lomeroe/bp_41307 - -diff --git a/doc/topics/releases/2016.11.8.rst b/doc/topics/releases/2016.11.8.rst -index be5fe11bb1..860c4ceb14 100644 ---- a/doc/topics/releases/2016.11.8.rst -+++ b/doc/topics/releases/2016.11.8.rst -@@ -88,7 +88,7 @@ Changelog for v2016.11.7..v2016.11.8 - - * c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity - -- * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrited multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. -+ * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrote multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. - - * **ISSUE** `#42279`_: (`dafyddj`_) win_lgpo matches multiple policies due to startswith() (refs: `#43154`_, `#43116`_) - -@@ -963,12 +963,12 @@ Changelog for v2016.11.7..v2016.11.8 - - * 8c048403d7 Detect Server OS with a desktop release name - --* **PR** `#42356`_: (`meaksh`_) Allow to check whether a function is available on the AliasesLoader wrapper -+* **PR** `#42356`_: (`meaksh`_) Allow checking whether a function is available on the AliasesLoader wrapper - @ *2017-07-19 16:56:41 UTC* - - * 0a72e56f6b Merge pull request `#42356`_ from meaksh/2016.11-AliasesLoader-wrapper-fix - -- * 915d94219e Allow to check whether a function is available on the AliasesLoader wrapper -+ * 915d94219e Allow checking whether a function is available on the AliasesLoader wrapper - - * **PR** `#42368`_: (`twangboy`_) Remove build and dist directories before install (2016.11) - @ *2017-07-19 16:47:28 UTC* -@@ -1569,7 +1569,7 @@ Changelog for v2016.11.7..v2016.11.8 - - * 7f6961378e test and lint fixes - -- * 8ee48432f4 Suppress output of crypt context and be more specifc with whitespace vs. serial -+ * 8ee48432f4 Suppress output of crypt context and be more specific with whitespace vs. serial - - * 61f817d172 Match serials based on output position (fix for non-English languages) - -diff --git a/doc/topics/releases/2016.11.9.rst b/doc/topics/releases/2016.11.9.rst -index 3a37892c2c..e0ea0accce 100644 ---- a/doc/topics/releases/2016.11.9.rst -+++ b/doc/topics/releases/2016.11.9.rst -@@ -477,7 +477,7 @@ Changelog for v2016.11.8..v2016.11.9 - - * 998d714ee7 Merge pull request `#44517`_ from whytewolf/publish_port_doc_missing - -- * 4b5855283a missed one place where i didnt chanbge master_port from my copy to publish_port -+ * 4b5855283a missed one place where i didn't chanbge master_port from my copy to publish_port - - * e4610baea5 update doc to have publish port - -@@ -682,7 +682,7 @@ Changelog for v2016.11.8..v2016.11.9 - - * cab54e34b5 Merge pull request `#44173`_ from twangboy/win_system_docs - -- * 8e111b413d Fix some of the wording and grammer errors -+ * 8e111b413d Fix some of the wording and grammar errors - - * a12bc5ae41 Use google style docstrings - -@@ -1127,12 +1127,12 @@ Changelog for v2016.11.8..v2016.11.9 - - * **ISSUE** `#40311`_: (`cralston0`_) --hide-timeout used with --output json --static produces unparseable JSON (refs: `#43772`_) - --* **PR** `#43772`_: (`gtmanfred`_) dont print Minion not responding with quiet -+* **PR** `#43772`_: (`gtmanfred`_) don't print Minion not responding with quiet - @ *2017-09-27 15:39:18 UTC* - - * 1a8cc60bb4 Merge pull request `#43772`_ from gtmanfred/2016.11 - -- * 0194c60960 dont print Minion not responding with quiet -+ * 0194c60960 don't print Minion not responding with quiet - - * **PR** `#43747`_: (`rallytime`_) Add GPG Verification section to Contributing Docs - @ *2017-09-26 21:25:37 UTC* -diff --git a/doc/topics/releases/2016.3.1.rst b/doc/topics/releases/2016.3.1.rst -index a544598715..cb0722ba62 100644 ---- a/doc/topics/releases/2016.3.1.rst -+++ b/doc/topics/releases/2016.3.1.rst -@@ -190,7 +190,7 @@ Changelog for v2016.3.0..v2016.3.1 - - * **PR** `#33861`_: (`cachedout`_) Set master and cloud to log level warning - -- * **PR** `#33821`_: (`cachedout`_) Restore deafault log level to warning (refs: `#33861`_) -+ * **PR** `#33821`_: (`cachedout`_) Restore default log level to warning (refs: `#33861`_) - - * **PR** `#33698`_: (`opdude`_) Vsphere fixes - @ *2016-06-08 14:12:17 UTC* -@@ -259,12 +259,12 @@ Changelog for v2016.3.0..v2016.3.1 - - * **ISSUE** `#33818`_: (`saltuser`_) 2016.3.0 minion default log level INFO (refs: `#33821`_, `#33861`_) - --* **PR** `#33821`_: (`cachedout`_) Restore deafault log level to warning (refs: `#33861`_) -+* **PR** `#33821`_: (`cachedout`_) Restore default log level to warning (refs: `#33861`_) - @ *2016-06-07 16:51:46 UTC* - - * 3f6d06a060 Merge pull request `#33821`_ from cachedout/issue_33818 - -- * 52f1f77a38 Restore deafault log level to warning -+ * 52f1f77a38 Restore default log level to warning - - * **ISSUE** `#33578`_: (`ohauer`_) 2016.3.0 FreeBSD Failed to load grains defined in grain file disks.disks in function , error: (refs: `#33604`_, `#33767`_) - -@@ -632,7 +632,7 @@ Changelog for v2016.3.0..v2016.3.1 - - * c738a0de76 fix a KeyError if group is provided but not user - --* **ISSUE** `#33543`_: (`arthurlogilab`_) Thorium documentation is incorrectly formated and appears partially on docs.saltstack.com (refs: `#33550`_) -+* **ISSUE** `#33543`_: (`arthurlogilab`_) Thorium documentation is incorrectly formatted and appears partially on docs.saltstack.com (refs: `#33550`_) - - * **PR** `#33550`_: (`jacobhammons`_) Fixes display of thorium docs - @ *2016-05-26 17:57:05 UTC* -@@ -723,7 +723,7 @@ Changelog for v2016.3.0..v2016.3.1 - - * 9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() - -- * 7ba40c4f31 jobs.exit_success allow to check if a job has executed and exit successfully -+ * 7ba40c4f31 jobs.exit_success allow checking if a job has executed and exit successfully - - * 70eb7b66f3 Merge pull request `#33487`_ from jtand/glance_doc_fixes - -diff --git a/doc/topics/releases/2016.3.2.rst b/doc/topics/releases/2016.3.2.rst -index 74d0c00490..d9b6817555 100644 ---- a/doc/topics/releases/2016.3.2.rst -+++ b/doc/topics/releases/2016.3.2.rst -@@ -178,7 +178,7 @@ Changelog for v2016.3.1..v2016.3.2 - - * fb223e1bd4 Invalidate the target cache very quickly (`#34862`_) - -- * 1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (`#34869`_) -+ * 1ca1367289 Fail git.latest states with uncomitted changes when force_reset=False (`#34869`_) - - * 4f4381e5b9 Merge pull request `#34859`_ from cachedout/fix_wheel_test - -@@ -403,7 +403,7 @@ Changelog for v2016.3.1..v2016.3.2 - - * **ISSUE** `saltstack/salt#34630`_: (`bdrung`_) Spelling errors (refs: `#34756`_, `#34722`_) - --* **ISSUE** `saltstack/salt#33923`_: (`pavankumar2203`_) Salt module certutil install doesnt work (refs: `#34756`_) -+* **ISSUE** `saltstack/salt#33923`_: (`pavankumar2203`_) Salt module certutil install doesn't work (refs: `#34756`_) - - * **PR** `#34756`_: (`jacobhammons`_) Rebuild man pages - -@@ -1823,7 +1823,7 @@ Changelog for v2016.3.1..v2016.3.2 - - * 2cf787d4ba 2016.3.0 known issues update - -- * **PR** `#33908`_: (`ticosax`_) [boto_lambda] handle ommitted Permissions parameter -+ * **PR** `#33908`_: (`ticosax`_) [boto_lambda] handle omitted Permissions parameter - - * **ISSUE** `#33575`_: (`anlutro`_) File states seem slower in 2016.3, especially on first cache retrieval (refs: `#33896`_) - -diff --git a/doc/topics/releases/2016.3.3.rst b/doc/topics/releases/2016.3.3.rst -index ab288a289d..e3e4ccc991 100644 ---- a/doc/topics/releases/2016.3.3.rst -+++ b/doc/topics/releases/2016.3.3.rst -@@ -503,7 +503,7 @@ Changelog for v2016.3.2..v2016.3.3 - - * 8a5b47b5d7 Collect all error data from the wfuncs call - -- * 11864c31b7 supress a stack trace to show clean ssh error -+ * 11864c31b7 suppress a stack trace to show clean ssh error - - * 9fbfa282fa wow this solves an issue! - -@@ -704,7 +704,7 @@ Changelog for v2016.3.2..v2016.3.3 - - * f0961e741e Merge with 2016.3 - --* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe dont wipe the filesystem information (refs: `#35253`_) -+* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe don't wipe the filesystem information (refs: `#35253`_) - - * **PR** `#35259`_: (`cachedout`_) Fixup 35253 - @ *2016-08-06 21:59:48 UTC* -@@ -717,7 +717,7 @@ Changelog for v2016.3.2..v2016.3.3 - - * 6714e8f386 Fix mock call in disk wipe test - --* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe dont wipe the filesystem information (refs: `#35253`_) -+* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe don't wipe the filesystem information (refs: `#35253`_) - - * **PR** `#35253`_: (`abednarik`_) Fix disk.wipe missing option. (refs: `#35259`_) - @ *2016-08-06 21:55:01 UTC* -@@ -822,7 +822,7 @@ Changelog for v2016.3.2..v2016.3.3 - - * e1fcb8311d Put pkg.latest_version in try/except structure Move refreshed or refresh to different spot (just for code tidyness) - -- * e0b6261659 changed name of varibale 'refreshed' to 'was_refreshed' -+ * e0b6261659 changed name of variable 'refreshed' to 'was_refreshed' - - * 340110b4b4 Move check for rtag to outermost-nesting in function - -@@ -858,7 +858,7 @@ Changelog for v2016.3.2..v2016.3.3 - - * 77b1f43b0d Merge pull request `#35110`_ from hu-dabao/master-check-lighter - -- * 3a3b66e27d dont return job status back to master for master_alive and master_failback schedules -+ * 3a3b66e27d don't return job status back to master for master_alive and master_failback schedules - - * **PR** `#35104`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-08-01 18:56:43 UTC* -diff --git a/doc/topics/releases/2016.3.4.rst b/doc/topics/releases/2016.3.4.rst -index c8a23d8bf8..8a0561f72b 100644 ---- a/doc/topics/releases/2016.3.4.rst -+++ b/doc/topics/releases/2016.3.4.rst -@@ -946,7 +946,7 @@ Changelog for v2016.3.3..v2016.3.4 - - * 6ce4653fa3 Error on reaction with missing SLS file - --* **ISSUE** `saltstack/salt#36788`_: (`damon-atkins`_) pillar/libvirt.py assume certtool is available and works everytime (refs: `#36803`_) -+* **ISSUE** `saltstack/salt#36788`_: (`damon-atkins`_) pillar/libvirt.py assume certtool is available and works every time (refs: `#36803`_) - - * **PR** `#36803`_: (`gtmanfred`_) do not load libvirt pillar if certtool is unavailable - @ *2016-10-06 11:15:14 UTC* -@@ -2519,7 +2519,7 @@ Changelog for v2016.3.3..v2016.3.4 - - * eda2ae0add Merge pull request `#35781`_ from thatch45/ssh_deploy_more - -- * 2558dcc100 follow up on the re-deploy if there is a checksum missmatch -+ * 2558dcc100 follow up on the re-deploy if there is a checksum mismatch - - * 165237412c Merge pull request `#35815`_ from gtmanfred/2015.8 - -diff --git a/doc/topics/releases/2016.3.5.rst b/doc/topics/releases/2016.3.5.rst -index f2b4f7cbbe..cfcace8daa 100644 ---- a/doc/topics/releases/2016.3.5.rst -+++ b/doc/topics/releases/2016.3.5.rst -@@ -169,9 +169,9 @@ Changelog for v2016.3.4..v2016.3.5 - - * fd2ee7db30 Add some simple unit tests for salt.config.api_config function - -- * 3d2fefc83b Make sure the pidfile and log_file values are overriden by api opts -+ * 3d2fefc83b Make sure the pidfile and log_file values are overridden by api opts - -- * 1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts -+ * 1f6b540e46 Make sure the pidfile and log_file values are overridden by api opts - - * 04d307f917 salt-api no longer forces the default timeout - -@@ -1100,7 +1100,7 @@ Changelog for v2016.3.4..v2016.3.5 - - * **PR** `#37826`_: (`rallytime`_) Update branch refs to more relevant branch - -- * **PR** `#37822`_: (`laleocen`_) add documenation for multiline encryption using nacl (refs: `#37826`_) -+ * **PR** `#37822`_: (`laleocen`_) add documentation for multiline encryption using nacl (refs: `#37826`_) - - * **ISSUE** `#19269`_: (`markuskramerIgitt`_) Undocumented feature `names:` of `file.directory` (refs: `#37823`_) - -diff --git a/doc/topics/releases/2016.3.6.rst b/doc/topics/releases/2016.3.6.rst -index db7183f43e..5c66fc3524 100644 ---- a/doc/topics/releases/2016.3.6.rst -+++ b/doc/topics/releases/2016.3.6.rst -@@ -153,12 +153,12 @@ Changelog for v2016.3.5..v2016.3.6 - - * af1545deed 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-16 20:46:43 UTC* - - * 116201f345 Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - -- * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistant user -+ * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistent user - - * **PR** `#40090`_: (`rallytime`_) Back-port `#40056`_ to 2016.3 - @ *2017-03-16 19:42:58 UTC* -@@ -188,9 +188,9 @@ Changelog for v2016.3.5..v2016.3.6 - - * 8dcffc7751 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner - -- * 9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' -+ * 9f5c3b7dcd Allows one to set custom timeouts for 'manage.up' and 'manage.status' - -- * 2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs -+ * 2102d9c75c Allows one to set 'timeout' and 'gather_job_timeout' via kwargs - - * **PR** `#40038`_: (`velom`_) correctly parse "pkg_name===version" from pip freeze - @ *2017-03-15 19:30:03 UTC* -@@ -233,12 +233,12 @@ Changelog for v2016.3.5..v2016.3.6 - - * 5d84b40bfd 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-14 17:16:14 UTC* - - * 0c61d064ad Merge pull request `#39980`_ from vutny/cmd-run-state-bg - -- * a81dc9dfc1 [2016.3] Allow to use `bg` kwarg for `cmd.run` state function -+ * a81dc9dfc1 [2016.3] Allow using `bg` kwarg for `cmd.run` state function - - * **ISSUE** `#39942`_: (`Foxlik`_) Web Documentation not in sync with release 2016.11.3 (refs: `#39994`_) - -@@ -738,7 +738,7 @@ Changelog for v2016.3.5..v2016.3.6 - - * 52440416ca Merge pull request `#39221`_ from lvg01/fix-bug-39220 - -- * e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ -+ * e8a41d6341 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ - - * a4b169e0bd Fixed wrong logic, fixes `#39220`_ - -@@ -883,7 +883,7 @@ Changelog for v2016.3.5..v2016.3.6 - - * **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_, `#39131`_) - -- * **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 - -@@ -1084,14 +1084,14 @@ Changelog for v2016.3.5..v2016.3.6 - - * **ISSUE** `#36121`_: (`Ashald`_) TemplateNotFound/Unable to cache file (refs: `#38875`_) - --* **PR** `#38875`_: (`terminalmage`_) Reactor: fix traceback when salt:// path is nonexistant -+* **PR** `#38875`_: (`terminalmage`_) Reactor: fix traceback when salt:// path is nonexistent - @ *2017-01-24 15:23:39 UTC* - - * b5df104fc2 Merge pull request `#38875`_ from terminalmage/issue36121 - - * fbc4d2a2c4 reactor: ensure glob_ref is a string - -- * 2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path -+ * 2e443d79a3 cp.cache_file: add note re: return for nonexistent salt:// path - - * **ISSUE** `#37413`_: (`Snarfingcode666`_) Salt-cloud vmware missing reboot command (refs: `#38887`_, `#38890`_) - -diff --git a/doc/topics/releases/2017.7.2.rst b/doc/topics/releases/2017.7.2.rst -index d68f35bd8a..2d5a386537 100644 ---- a/doc/topics/releases/2017.7.2.rst -+++ b/doc/topics/releases/2017.7.2.rst -@@ -940,7 +940,7 @@ Changelog for v2017.7.1..v2017.7.2 - - * 1cc86592ed Update return data before calling returners - --* **ISSUE** `#42842`_: (`Giandom`_) retreive kwargs passed with slack engine (refs: `#42884`_) -+* **ISSUE** `#42842`_: (`Giandom`_) retrieve kwargs passed with slack engine (refs: `#42884`_) - - * **PR** `#42884`_: (`Giandom`_) Convert to dict type the pillar string value passed from slack - @ *2017-08-16 22:30:43 UTC* -@@ -1229,12 +1229,12 @@ Changelog for v2017.7.1..v2017.7.2 - - * **ISSUE** `saltstack/salt-jenkins#480`_: (`rallytime`_) [2017.7] PY3 Debian 8 has several vmware unit tests failing (refs: `#42857`_) - --* **PR** `#42857`_: (`gtmanfred`_) use older name if _create_unverified_context is unvailable -+* **PR** `#42857`_: (`gtmanfred`_) use older name if _create_unverified_context is unavailable - @ *2017-08-11 13:37:59 UTC* - - * 3d05d89e09 Merge pull request `#42857`_ from gtmanfred/vmware - -- * c1f673eca4 use older name if _create_unverified_context is unvailable -+ * c1f673eca4 use older name if _create_unverified_context is unavailable - - * **PR** `#42866`_: (`twangboy`_) Change to GitPython version 2.1.1 - @ *2017-08-11 13:23:52 UTC* -@@ -1992,7 +1992,7 @@ Changelog for v2017.7.1..v2017.7.2 - - * 0a72e56f6b Merge pull request `#42356`_ from meaksh/2016.11-AliasesLoader-wrapper-fix - -- * 915d94219e Allow to check whether a function is available on the AliasesLoader wrapper -+ * 915d94219e Allow checking whether a function is available on the AliasesLoader wrapper - - * 10eb7b7a79 Merge pull request `#42368`_ from twangboy/win_fix_build_2016.11 - -diff --git a/doc/topics/releases/2017.7.3.rst b/doc/topics/releases/2017.7.3.rst -index dbddfa9649..4ebbd4918e 100644 ---- a/doc/topics/releases/2017.7.3.rst -+++ b/doc/topics/releases/2017.7.3.rst -@@ -119,7 +119,7 @@ Changelog for v2017.7.2..v2017.7.3 - * **PR** `#45664`_: (`rallytime`_) Back-port `#45452`_ to 2017.7.3 - @ *2018-01-24 15:33:13 UTC* - -- * **PR** `#45452`_: (`adelcast`_) opkg.py: make owner fuction return value, instead of iterator (refs: `#45664`_) -+ * **PR** `#45452`_: (`adelcast`_) opkg.py: make owner function return value, instead of iterator (refs: `#45664`_) - - * 0717f7a578 Merge pull request `#45664`_ from rallytime/bp-45452 - -@@ -435,7 +435,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * 9a15ec3430 Updating versionadded string. Fixing typo. - -- * edfc3dc078 Adding in documention for `auth_events` configuration option -+ * edfc3dc078 Adding in documentation for `auth_events` configuration option - - * 3ee4eabffd Fixing small typo - -@@ -1063,7 +1063,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * 4b60b1ec84 Merge remote branch 'refs/remotes/upstream/2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg - -- * b46f818a57 Raise a PR to fix 2016 issues commited here, fixed issues with merge. -+ * b46f818a57 Raise a PR to fix 2016 issues committed here, fixed issues with merge. - - * 32ef1e12ae Merge branch '2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg - -@@ -1389,7 +1389,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * 998d714ee7 Merge pull request `#44517`_ from whytewolf/publish_port_doc_missing - -- * 4b5855283a missed one place where i didnt chanbge master_port from my copy to publish_port -+ * 4b5855283a missed one place where i didn't chanbge master_port from my copy to publish_port - - * e4610baea5 update doc to have publish port - -@@ -1606,9 +1606,9 @@ Changelog for v2017.7.2..v2017.7.3 - - * 3bb385b44e removing debugging logging - -- * 7f0ff5a8b0 When passing IDs on the command line convert them all the strings for later comparision. -+ * 7f0ff5a8b0 When passing IDs on the command line convert them all the strings for later comparison. - -- * 99e436add4 When looking for job ids to remove based on the tag_name the comparision was comparing an INT to a STR, so the correct job id was not being returned. -+ * 99e436add4 When looking for job ids to remove based on the tag_name the comparison was comparing an INT to a STR, so the correct job id was not being returned. - - * **ISSUE** `#44136`_: (`dupsatou`_) KeyError: 'runas' after updating to latest salt in yum repo. (refs: `#44695`_) - -@@ -1764,7 +1764,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * 88ef9f18fc ignore lint error on import - -- * 25427d845e convert key iterator to list as python 3 wont index an iterator -+ * 25427d845e convert key iterator to list as python 3 won't index an iterator - - * bce50154e5 Merge branch '2017.7' into improve-net-load - -@@ -1825,14 +1825,14 @@ Changelog for v2017.7.2..v2017.7.3 - - * c6733ac1ee pop None - --* **PR** `#44616`_: (`Ch3LL`_) Add Non Base Environement salt:// source integration test -+* **PR** `#44616`_: (`Ch3LL`_) Add Non Base Environment salt:// source integration test - @ *2017-11-22 16:13:54 UTC* - - * d6ccf4bb30 Merge pull request `#44616`_ from Ch3LL/nonbase_test - - * 80b71652e3 Merge branch '2017.7' into nonbase_test - -- * c9ba33432e Add Non Base Environement salt:// source integration test -+ * c9ba33432e Add Non Base Environment salt:// source integration test - - * **PR** `#44617`_: (`Ch3LL`_) Add ssh thin_dir integration test - @ *2017-11-22 16:12:51 UTC* -@@ -1961,7 +1961,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * ce1882943d Use salt.utils.files.mkstemp() instead - -- * 6689bd3b2d Dont use dangerous os.tmpnam -+ * 6689bd3b2d Don't use dangerous os.tmpnam - - * 2d6176b0bc Fx2 proxy minion: clean return, like all the other modules - -@@ -2228,7 +2228,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * cab54e34b5 Merge pull request `#44173`_ from twangboy/win_system_docs - -- * 8e111b413d Fix some of the wording and grammer errors -+ * 8e111b413d Fix some of the wording and grammar errors - - * a12bc5ae41 Use google style docstrings - -@@ -2797,9 +2797,9 @@ Changelog for v2017.7.2..v2017.7.3 - * **PR** `#44133`_: (`cachedout`_) Fix typos in parallel states docs - @ *2017-10-17 15:24:19 UTC* - -- * 6252f82f58 Merge pull request `#44133`_ from cachedout/fix_paralell_docs -+ * 6252f82f58 Merge pull request `#44133`_ from cachedout/fix_parallel_docs - -- * 8d1c1e21f0 Fix typos in paralell states docs -+ * 8d1c1e21f0 Fix typos in parallel states docs - - * **PR** `#44135`_: (`timfreund`_) Insert missing verb in gitfs walkthrough - @ *2017-10-17 14:32:13 UTC* -@@ -3366,7 +3366,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * 1a8cc60bb4 Merge pull request `#43772`_ from gtmanfred/2016.11 - -- * 0194c60960 dont print Minion not responding with quiet -+ * 0194c60960 don't print Minion not responding with quiet - - * 9dee896fb9 Merge pull request `#43747`_ from rallytime/gpg-verification - -@@ -4389,7 +4389,7 @@ Changelog for v2017.7.2..v2017.7.3 - - * c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity - -- * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrited multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. -+ * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrote multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. - - * b90e59ede9 Merge pull request `#43154`_ from lomeroe/bp-43116-2016.11 - -diff --git a/doc/topics/releases/2017.7.5.rst b/doc/topics/releases/2017.7.5.rst -index ef2ed5b2f7..6449d75860 100644 ---- a/doc/topics/releases/2017.7.5.rst -+++ b/doc/topics/releases/2017.7.5.rst -@@ -872,7 +872,7 @@ Changelog for v2017.7.4..v2017.7.5 - * **PR** `#45932`_: (`The-Loeki`_) Fix cmd run_all bg error - @ *2018-02-16 14:53:15 UTC* - -- * **PR** `#39980`_: (`vutny`_) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function (refs: `#45932`_) -+ * **PR** `#39980`_: (`vutny`_) [2016.3] Allow using `bg` kwarg for `cmd.run` state function (refs: `#45932`_) - - * 5e0e2a30e2 Merge pull request `#45932`_ from The-Loeki/fix_cmd_run_all_bg - -diff --git a/doc/topics/releases/2017.7.6.rst b/doc/topics/releases/2017.7.6.rst -index e7407115af..6791fb68f1 100644 ---- a/doc/topics/releases/2017.7.6.rst -+++ b/doc/topics/releases/2017.7.6.rst -@@ -276,14 +276,14 @@ Changelog for v2017.7.5..v2017.7.6 - - * **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#47106`_, `#47433`_) - --* **PR** `#47433`_: (`s0undt3ch`_) Add missing requirements files not commited in `#47106`_ -+* **PR** `#47433`_: (`s0undt3ch`_) Add missing requirements files not committed in `#47106`_ - @ *2018-05-02 20:57:14 UTC* - - * **PR** `#47106`_: (`DmitryKuzmenko`_) Tornado50 compatibility fixes (refs: `#47433`_) - - * ed69821d19 Merge pull request `#47433`_ from s0undt3ch/2017.7 - -- * 5abadf25d6 Add missing requirements files not commited in `#47106`_ -+ * 5abadf25d6 Add missing requirements files not committed in `#47106`_ - - * **ISSUE** `#47424`_: (`bcharron`_) "salt-cloud -m" fails with nova driver: "There was a query error: u'state'" (refs: `#47429`_) - -@@ -489,7 +489,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * 65c3ba7ff1 Remove useless documentation - -- * 5d67cb27de Remove unncessary commented line -+ * 5d67cb27de Remove unnecessary commented line - - * **PR** `#47347`_: (`dwoz`_) Proper fix for mysql tests - @ *2018-04-27 17:27:53 UTC* -@@ -557,7 +557,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * 85451f48d4 Fix python 3 support for inet_pton function - --* **PR** `#47339`_: (`dwoz`_) Use salt.utils.fopen for line ending consistancy -+* **PR** `#47339`_: (`dwoz`_) Use salt.utils.fopen for line ending consistency - @ *2018-04-26 22:39:56 UTC* - - * e4779f3246 Merge pull request `#47339`_ from dwoz/ssh_key_test_fix -@@ -566,7 +566,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * b2ae5889b7 Close the temporary file handle - -- * 9f7f83a975 Use salt.utils.fopen for line ending consistancy -+ * 9f7f83a975 Use salt.utils.fopen for line ending consistency - - * **PR** `#47335`_: (`dwoz`_) Remove un-needed string-escape - @ *2018-04-26 21:49:27 UTC* -@@ -712,7 +712,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * **PR** `#47207`_: (`benediktwerner`_) Fix pip_state with pip3 if no changes occourred (refs: `#47220`_) - -- * **PR** `#47102`_: (`gtmanfred`_) dont allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) -+ * **PR** `#47102`_: (`gtmanfred`_) don't allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) - - * 4e2e1f0719 Merge pull request `#47220`_ from benediktwerner/fix-pip-2017.7 - -@@ -894,7 +894,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * bd0c23396c fix pip.req import error in pip 10.0.0 - --* **PR** `#47102`_: (`gtmanfred`_) dont allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) -+* **PR** `#47102`_: (`gtmanfred`_) don't allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) - @ *2018-04-17 20:44:58 UTC* - - * eb5ac51a48 Merge pull request `#47102`_ from gtmanfred/2017.7 -@@ -905,7 +905,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * 4c07a3d1e9 fix other tests - -- * b71e3d8a04 dont allow using no_use_wheel for pip 10.0.0 or newer -+ * b71e3d8a04 don't allow using no_use_wheel for pip 10.0.0 or newer - - * **PR** `#47037`_: (`twangboy`_) Fix build_env scripts - @ *2018-04-17 18:54:17 UTC* -@@ -1253,7 +1253,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * 058bbed221 Merge pull request `#46799`_ from garethgreenaway/46762_prereq_shenanigans_tests - -- * 13875e78cf Fixing documention string for test. -+ * 13875e78cf Fixing documentation string for test. - - * 3d288c44d4 Fixing test documentation - -@@ -1393,7 +1393,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * 2bee383e9d correct create list item value names if the valuePrefix attribute does not exist on the list item, the value is the value name, other wise, the valuename a number with the valuePrefix prepended to it - --* **ISSUE** `#46347`_: (`twangboy`_) Buid 449: unit.modules.test_inspect_collector (refs: `#46675`_) -+* **ISSUE** `#46347`_: (`twangboy`_) Build 449: unit.modules.test_inspect_collector (refs: `#46675`_) - - * **PR** `#46675`_: (`dwoz`_) Skip test when git symlinks are not configured - @ *2018-04-03 12:19:19 UTC* -@@ -1564,11 +1564,11 @@ Changelog for v2017.7.5..v2017.7.6 - * **PR** `#46732`_: (`rallytime`_) Back-port `#46032`_ to 2017.7 - @ *2018-03-28 13:43:17 UTC* - -- * **PR** `#46032`_: (`DmitryKuzmenko`_) Workaroung python bug in traceback.format_exc() (refs: `#46732`_) -+ * **PR** `#46032`_: (`DmitryKuzmenko`_) Workaround python bug in traceback.format_exc() (refs: `#46732`_) - - * 1222bdbc00 Merge pull request `#46732`_ from rallytime/bp-46032 - -- * bf0b962dc0 Workaroung python bug in traceback.format_exc() -+ * bf0b962dc0 Workaround python bug in traceback.format_exc() - - * **ISSUE** `#28142`_: (`zmalone`_) Deprecate or update the copr repo (refs: `#46749`_) - -@@ -1823,7 +1823,7 @@ Changelog for v2017.7.5..v2017.7.6 - - * f038e3c452 Merge pull request `#46571`_ from garethgreenaway/46552_onfail_and_require - -- * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. -+ * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't execute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. - - * **ISSUE** `#46512`_: (`blarghmatey`_) git.pull failing when run from the salt scheduler (refs: `#46520`_) - -@@ -1911,11 +1911,11 @@ Changelog for v2017.7.5..v2017.7.6 - * **PR** `#46511`_: (`rallytime`_) Back-port `#45769`_ to 2017.7 - @ *2018-03-13 17:08:52 UTC* - -- * **PR** `#45769`_: (`Quarky9`_) Surpress boto WARNING during SQS msg decode in sqs_engine (refs: `#46511`_) -+ * **PR** `#45769`_: (`Quarky9`_) Suppress boto WARNING during SQS msg decode in sqs_engine (refs: `#46511`_) - - * 5cc11129f1 Merge pull request `#46511`_ from rallytime/bp-45769 - -- * a8ffceda53 Surpress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 -+ * a8ffceda53 Suppress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 - - .. _`#20581`: https://github.com/saltstack/salt/issues/20581 - .. _`#20639`: https://github.com/saltstack/salt/issues/20639 -diff --git a/doc/topics/releases/2017.7.8.rst b/doc/topics/releases/2017.7.8.rst -index 891c361da0..aae64ae3ca 100644 ---- a/doc/topics/releases/2017.7.8.rst -+++ b/doc/topics/releases/2017.7.8.rst -@@ -398,7 +398,7 @@ Changelog for v2017.7.7..v2017.7.8 - - * 8a1285239a Merge pull request `#48426`_ from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed - -- * 9b0f5dd212 Fixing identation, removing some unnecessary conditionals. -+ * 9b0f5dd212 Fixing indentation, removing some unnecessary conditionals. - - * 727964ab55 One last cleanup. - -@@ -594,7 +594,7 @@ Changelog for v2017.7.7..v2017.7.8 - - * 83e4bba916 Merge pull request `#48635`_ from nbraud/acme - -- * 3673bae9de modules/acme: explicitely ignore the `perms` return value -+ * 3673bae9de modules/acme: explicitly ignore the `perms` return value - - * 1800a231e8 Fixup some schema expectations - -@@ -780,9 +780,9 @@ Changelog for v2017.7.7..v2017.7.8 - - * 1b6e6388f8 Merge pull request `#48588`_ from garethgreenaway/48415_event_send_multi_master - -- * fab25af1a9 Adding some quick documention about why we are setting ret=True following the channel.send. -+ * fab25af1a9 Adding some quick documentation about why we are setting ret=True following the channel.send. - -- * bf78f4b188 If the channel send is sucessful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False. -+ * bf78f4b188 If the channel send is successful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False. - - * 8d1551c5fb When using Salt multi-master, if we encouter a salt master that has not accepted the minion key yet we should not exit right away, rather continue on and try the next salt master available in the list. - -@@ -1255,11 +1255,11 @@ Changelog for v2017.7.7..v2017.7.8 - * **PR** `#48293`_: (`rallytime`_) Back-port `#47453`_ to 2017.7 - @ *2018-06-25 19:06:42 UTC* - -- * **PR** `#47453`_: (`dqminh`_) dont reset system locale when running rabbitmqctl commands (refs: `#48293`_) -+ * **PR** `#47453`_: (`dqminh`_) don't reset system locale when running rabbitmqctl commands (refs: `#48293`_) - - * 06a927b2aa Merge pull request `#48293`_ from rallytime/bp-47453 - -- * e96ab6778e dont reset system locale when running rabbitmqctl commands -+ * e96ab6778e don't reset system locale when running rabbitmqctl commands - - * **PR** `#48219`_: (`zer0def`_) Fix: LXC legacy configuration key warnings falsely report errors during state change - @ *2018-06-25 13:46:07 UTC* -@@ -1286,7 +1286,7 @@ Changelog for v2017.7.7..v2017.7.8 - - * 83d7d286c4 Merge pull request `#48080`_ from lusche/2017.7 - -- * 917dc985fc `#47984`_ remove the line completly -+ * 917dc985fc `#47984`_ remove the line completely - - * ba12ee947b Merge branch '2017.7' of https://github.com/saltstack/salt into 2017.7 - -@@ -1895,12 +1895,12 @@ Changelog for v2017.7.7..v2017.7.8 - - * 4475ba19b8 Prevent zypper from parsing repo configuration from not .repo files - --* **PR** `#47781`_: (`rallytime`_) Update cloud test profile and docs to use new Linode size lables -+* **PR** `#47781`_: (`rallytime`_) Update cloud test profile and docs to use new Linode size labels - @ *2018-05-23 13:09:13 UTC* - - * 0e87559ee3 Merge pull request `#47781`_ from rallytime/update-linode-sizes - -- * a90c1b760e Update cloud test profile and docs to use new Linode size lables -+ * a90c1b760e Update cloud test profile and docs to use new Linode size labels - - * **PR** `#47748`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.6 to 2017.7 - @ *2018-05-22 20:53:02 UTC* -@@ -2251,12 +2251,12 @@ Changelog for v2017.7.7..v2017.7.8 - - * d22ed7dffa added handling for the aws error ConflictingDomainExists - --* **PR** `#47444`_: (`terminalmage`_) Skip trying to render a template for a nonexistant SLS file -+* **PR** `#47444`_: (`terminalmage`_) Skip trying to render a template for a nonexistent SLS file - @ *2018-05-07 13:48:24 UTC* - - * 7f53be6e92 Merge pull request `#47444`_ from terminalmage/render_state-spurious-error - -- * a1e9fe00fd Skip trying to render a template for a nonexistant SLS file -+ * a1e9fe00fd Skip trying to render a template for a nonexistent SLS file - - * **PR** `#47478`_: (`terminalmage`_) Rename pip state test modules to match naming convention - @ *2018-05-07 13:13:13 UTC* -diff --git a/doc/topics/releases/2017.7.9.rst b/doc/topics/releases/2017.7.9.rst -index 8b45363a81..3b131615c4 100644 ---- a/doc/topics/releases/2017.7.9.rst -+++ b/doc/topics/releases/2017.7.9.rst -@@ -11,6 +11,6 @@ Salt Cloud Features - GCE Driver - ---------- - The GCE salt cloud driver can now be used with GCE instance credentials by --setting the configuration paramaters ``service_account_private_key`` and -+setting the configuration parameters ``service_account_private_key`` and - ``service_account_private_email`` to an empty string. - -diff --git a/doc/topics/releases/2018.3.1.rst b/doc/topics/releases/2018.3.1.rst -index 320fddb7b7..5d52c8bd33 100644 ---- a/doc/topics/releases/2018.3.1.rst -+++ b/doc/topics/releases/2018.3.1.rst -@@ -66,7 +66,7 @@ Changes to Automatically Updating the Roster File - - In ``2018.3.0`` salt-ssh was configured to automatically update the flat roster - file if a minion was not found for salt-ssh. This was decided to be --undesireable as a default. The ``--skip-roster`` flag has been removed and -+undesirable as a default. The ``--skip-roster`` flag has been removed and - replaced with ``--update-roster``, which will enable salt-ssh to add minions - to the flat roster file. This behavior can also be enabled by setting - ``ssh_update_roster: True`` in the master config file. -@@ -497,7 +497,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * ed69821d19 Merge pull request `#47433`_ from s0undt3ch/2017.7 - -- * 5abadf25d6 Add missing requirements files not commited in `#47106`_ -+ * 5abadf25d6 Add missing requirements files not committed in `#47106`_ - - * **ISSUE** `#47443`_: (`skylerberg`_) Input validation does not raise SaltInvocationError in win_dsc.py (refs: `#47505`_) - -@@ -789,7 +789,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * 65c3ba7ff1 Remove useless documentation - -- * 5d67cb27de Remove unncessary commented line -+ * 5d67cb27de Remove unnecessary commented line - - * 8de3d41adb fixed vpc_peering_connection_name option - -@@ -934,7 +934,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * b2ae5889b7 Close the temporary file handle - -- * 9f7f83a975 Use salt.utils.fopen for line ending consistancy -+ * 9f7f83a975 Use salt.utils.fopen for line ending consistency - - * b221860151 Merge pull request `#47335`_ from dwoz/pip_test_fix - -@@ -1256,12 +1256,12 @@ Changelog for v2018.3.0..v2018.3.1 - - * 9075070573 make sure not to send invalid information - --* **ISSUE** `#46977`_: (`gtmanfred`_) [2018.3.0] Backwards compatibilty breaking change in 2018.3.0 (refs: `#47038`_) -+* **ISSUE** `#46977`_: (`gtmanfred`_) [2018.3.0] Backwards compatibility breaking change in 2018.3.0 (refs: `#47038`_) - - * **PR** `#47038`_: (`garethgreenaway`_) [2018.3] fix to fileclient.py - @ *2018-04-25 14:57:04 UTC* - -- * 205701dcbe Merge pull request `#47038`_ from garethgreenaway/46977_fixing_fileclient_forward_compatibilty -+ * 205701dcbe Merge pull request `#47038`_ from garethgreenaway/46977_fixing_fileclient_forward_compatibility - - * ba01d2133a Updating version.py to include Magnesium. - -@@ -1517,7 +1517,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * 4c07a3d1e9 fix other tests - -- * b71e3d8a04 dont allow using no_use_wheel for pip 10.0.0 or newer -+ * b71e3d8a04 don't allow using no_use_wheel for pip 10.0.0 or newer - - * c1dc42e67e Merge pull request `#47037`_ from twangboy/fix_dev_scripts - -@@ -1753,7 +1753,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * a52137ee36 Merge pull request `#47109`_ from garethgreenaway/46943_slack_engine_fixes - -- * 02baa76595 Fixing a bug that occured when a comment was added to a message sent to Slack by Salt. Also making `slack_engine:groups_pillar` optional. -+ * 02baa76595 Fixing a bug that occurred when a comment was added to a message sent to Slack by Salt. Also making `slack_engine:groups_pillar` optional. - - * **PR** `#47045`_: (`tankywoo`_) Fix ba7d00f5 for gentoo pkg.installed method - @ *2018-04-17 13:55:45 UTC* -@@ -1911,18 +1911,18 @@ Changelog for v2018.3.0..v2018.3.1 - - * c33de7c82d Merge pull request `#47009`_ from garethgreenaway/46947_slack_documentation_update_catch_non_dicts - -- * f0fadbb4ce Fixing indention for slack documention. Updating try..except to ensure we catch when groups aren't dicts. -+ * f0fadbb4ce Fixing indention for slack documentation. Updating try..except to ensure we catch when groups aren't dicts. - - * **PR** `#47023`_: (`rallytime`_) Back-port `#46997`_ to 2018.3 - @ *2018-04-12 15:05:24 UTC* - -- * **PR** `#46997`_: (`LukeCarrier`_) Fix respository (=> repository) typo in sls_build (refs: `#47023`_) -+ * **PR** `#46997`_: (`LukeCarrier`_) Fix repository (=> repository) typo in sls_build (refs: `#47023`_) - - * **PR** `#44638`_: (`terminalmage`_) Many improvements to docker network and container states (refs: `#46997`_) - - * 68d17c71f1 Merge pull request `#47023`_ from rallytime/bp-46997 - -- * c2c60f4ffc Fix respository (=> repository) typo in sls_build -+ * c2c60f4ffc Fix repository (=> repository) typo in sls_build - - * **PR** `#47026`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 - @ *2018-04-12 14:39:41 UTC* -@@ -2137,7 +2137,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * dceda5eb88 Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests. - -- * 07d7e3ca01 Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt-ssh. -+ * 07d7e3ca01 Adding a new integration test and corresponding state files to test availability of jinja filters when using salt-ssh. - - * **ISSUE** `#46880`_: (`liquidgecka`_) rabbitmq_policy broken in 2018.3.0 (refs: `#46973`_) - -@@ -2266,7 +2266,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * 058bbed221 Merge pull request `#46799`_ from garethgreenaway/46762_prereq_shenanigans_tests - -- * 13875e78cf Fixing documention string for test. -+ * 13875e78cf Fixing documentation string for test. - - * 3d288c44d4 Fixing test documentation - -@@ -2654,7 +2654,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * 1222bdbc00 Merge pull request `#46732`_ from rallytime/bp-46032 - -- * bf0b962dc0 Workaroung python bug in traceback.format_exc() -+ * bf0b962dc0 Workaround python bug in traceback.format_exc() - - * 50fe1e9480 Merge pull request `#46749`_ from vutny/doc-deprecate-copr - -@@ -2856,7 +2856,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * f038e3c452 Merge pull request `#46571`_ from garethgreenaway/46552_onfail_and_require - -- * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. -+ * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't execute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. - - * 2677330e19 Merge pull request `#46520`_ from gtmanfred/2017.7 - -@@ -2930,7 +2930,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * f15f92318d Add tests for salt.utils.win_reg - -- * f7112b19a2 Submit `#46527`_ agains 2018.3 -+ * f7112b19a2 Submit `#46527`_ against 2018.3 - - * **ISSUE** `#46334`_: (`sjorge`_) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: `#46426`_) - -@@ -3025,7 +3025,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * 5cc11129f1 Merge pull request `#46511`_ from rallytime/bp-45769 - -- * a8ffceda53 Surpress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 -+ * a8ffceda53 Suppress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 - - * 0e90c8ca6f Merge pull request `#46493`_ from terminalmage/issue46207 - -@@ -3552,7 +3552,7 @@ Changelog for v2018.3.0..v2018.3.1 - - * **PR** `#45932`_: (`The-Loeki`_) Fix cmd run_all bg error (refs: `#46172`_) - -- * **PR** `#39980`_: (`vutny`_) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function (refs: `#46172`_, `#45932`_) -+ * **PR** `#39980`_: (`vutny`_) [2016.3] Allow using `bg` kwarg for `cmd.run` state function (refs: `#46172`_, `#45932`_) - - * 20d869c228 Merge pull request `#46172`_ from The-Loeki/fix_cmd_run_all_bg_oxygen - -diff --git a/doc/topics/releases/2018.3.3.rst b/doc/topics/releases/2018.3.3.rst -index 2f2b271cad..cdf1f0e654 100644 ---- a/doc/topics/releases/2018.3.3.rst -+++ b/doc/topics/releases/2018.3.3.rst -@@ -1195,7 +1195,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * abd7f1312d Merge pull request `#48928`_ from Ch3LL/mac_runas - -- * 3d6455dbcd remove unecessary comment in setup -+ * 3d6455dbcd remove unnecessary comment in setup - - * 8e30db0217 move destructivetest to testname - -@@ -1305,12 +1305,12 @@ Changelog for v2018.3.2..v2018.3.3 - - * **ISSUE** `#37512`_: (`ChristianBeer`_) What's the precedence if multiple master configurations are specified? (refs: `#48888`_) - --* **PR** `#48888`_: (`terminalmage`_) Explictly document the configuration override priority -+* **PR** `#48888`_: (`terminalmage`_) Explicitly document the configuration override priority - @ *2018-08-02 16:57:18 UTC* - - * ec8e07e8ce Merge pull request `#48888`_ from terminalmage/issue37512 - -- * 7dce7cde14 Explictly document the configuration override priority -+ * 7dce7cde14 Explicitly document the configuration override priority - - * **PR** `#48871`_: (`dwoz`_) Remove unicode key pairs from environ after test - @ *2018-08-01 22:33:41 UTC* -@@ -1347,7 +1347,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 8a1285239a Merge pull request `#48426`_ from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed - -- * 9b0f5dd212 Fixing identation, removing some unnecessary conditionals. -+ * 9b0f5dd212 Fixing indentation, removing some unnecessary conditionals. - - * 727964ab55 One last cleanup. - -@@ -1517,7 +1517,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 95329acb1e Fileserver transfers bytes - -- * aa34a80997 Always trasfer bytes from fileserver roots -+ * aa34a80997 Always transfer bytes from fileserver roots - - * **PR** `#48822`_: (`Ch3LL`_) Fix salt-ssh state.sls_id TypeError key must be a string - @ *2018-07-30 20:29:29 UTC* -@@ -1695,7 +1695,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 83e4bba916 Merge pull request `#48635`_ from nbraud/acme - -- * 3673bae9de modules/acme: explicitely ignore the `perms` return value -+ * 3673bae9de modules/acme: explicitly ignore the `perms` return value - - * 1800a231e8 Fixup some schema expectations - -@@ -1807,9 +1807,9 @@ Changelog for v2018.3.2..v2018.3.3 - - * 1b6e6388f8 Merge pull request `#48588`_ from garethgreenaway/48415_event_send_multi_master - -- * fab25af1a9 Adding some quick documention about why we are setting ret=True following the channel.send. -+ * fab25af1a9 Adding some quick documentation about why we are setting ret=True following the channel.send. - -- * bf78f4b188 If the channel send is sucessful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False. -+ * bf78f4b188 If the channel send is successful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False. - - * 8d1551c5fb When using Salt multi-master, if we encouter a salt master that has not accepted the minion key yet we should not exit right away, rather continue on and try the next salt master available in the list. - -@@ -2611,7 +2611,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 06a927b2aa Merge pull request `#48293`_ from rallytime/bp-47453 - -- * e96ab6778e dont reset system locale when running rabbitmqctl commands -+ * e96ab6778e don't reset system locale when running rabbitmqctl commands - - * **ISSUE** `#45939`_: (`andygabby`_) user.present with hash_password: True detects change on every state.apply/highstate (refs: `#47147`_) - -@@ -2647,7 +2647,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 83d7d286c4 Merge pull request `#48080`_ from lusche/2017.7 - -- * 917dc985fc `#47984`_ remove the line completly -+ * 917dc985fc `#47984`_ remove the line completely - - * ba12ee947b Merge branch '2017.7' of https://github.com/saltstack/salt into 2017.7 - -@@ -3161,7 +3161,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * a040643a82 Accounting for certain situations when the query result is not a string, but actually a dictionary. - --* **ISSUE** `#48113`_: (`gaetanquentin`_) state file.line has error and erase file content completly, while with mode test=true it is ok (refs: `#48156`_) -+* **ISSUE** `#48113`_: (`gaetanquentin`_) state file.line has error and erase file content completely, while with mode test=true it is ok (refs: `#48156`_) - - * **PR** `#48156`_: (`garethgreenaway`_) [2018.3] Unicode fixes for file.line - @ *2018-06-17 19:34:08 UTC* -@@ -4004,7 +4004,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 0e87559ee3 Merge pull request `#47781`_ from rallytime/update-linode-sizes - -- * a90c1b760e Update cloud test profile and docs to use new Linode size lables -+ * a90c1b760e Update cloud test profile and docs to use new Linode size labels - - * 3ddc56cb9b Merge pull request `#47748`_ from rallytime/merge-2017.7 - -@@ -4570,7 +4570,7 @@ Changelog for v2018.3.2..v2018.3.3 - - * 7f53be6e92 Merge pull request `#47444`_ from terminalmage/render_state-spurious-error - -- * a1e9fe00fd Skip trying to render a template for a nonexistant SLS file -+ * a1e9fe00fd Skip trying to render a template for a nonexistent SLS file - - * 50b9c4d79d Merge pull request `#47478`_ from terminalmage/rename-pip-state-test - -diff --git a/doc/topics/releases/2018.3.4.rst b/doc/topics/releases/2018.3.4.rst -index 397ec93758..32da9d427f 100644 ---- a/doc/topics/releases/2018.3.4.rst -+++ b/doc/topics/releases/2018.3.4.rst -@@ -1816,7 +1816,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * 77e8dcc On later versions of elementary, the os_family is being populated as elementary. In order for the aptpkg module to function, we need to override is to be Debian. - --* **ISSUE** `#50311`_: (`marek-obuchowicz`_) pkg.installed state fails even though it suceeded (refs: `#50590`_, `#50333`_) -+* **ISSUE** `#50311`_: (`marek-obuchowicz`_) pkg.installed state fails even though it succeeded (refs: `#50590`_, `#50333`_) - - * **ISSUE** `#46689`_: (`mxork`_) pkg.installed: hold: True not applied to a package which is already installed. (refs: `#48426`_) - -@@ -2434,7 +2434,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * f28a4fa Merge pull request `#50211`_ from channias/fix-spm-modules-install - -- * 9b203d5 Fix broken install of additionnal modules in SPM packages -+ * 9b203d5 Fix broken install of additional modules in SPM packages - - * 6b4e07b Merge pull request `#50212`_ from dwoz/test_no_fail - -@@ -3157,7 +3157,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * eee82d3 Merge pull request `#49875`_ from dwoz/win_spm_tests - -- * e76a751 Use os.path.split for more consistancy -+ * e76a751 Use os.path.split for more consistency - - * bc54d15 Fix wart in spm on windows - -@@ -3218,7 +3218,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * 9ef9206 Actually catch the exception when we fail - -- * 19072f0 Use os.path.split for more consistancy -+ * 19072f0 Use os.path.split for more consistency - - * 6c22459 Merge remote-tracking branch 'origin/shelltests' into shelltests - -@@ -3356,13 +3356,13 @@ Changelog for v2018.3.3..v2018.3.4 - * **PR** `#49846`_: (`rallytime`_) Back-port `#49650`_ and `#49827`_ to 2018.3 - @ *2018-10-01 20:05:24 UTC* - -- * **PR** `#49827`_: (`dgmorrisjr`_) fixing mis-spelling of lattrs in file.py, referncing `#49204`_ (refs: `#49846`_) -+ * **PR** `#49827`_: (`dgmorrisjr`_) fixing mis-spelling of lattrs in file.py, referencing `#49204`_ (refs: `#49846`_) - - * **PR** `#49650`_: (`Yxnt`_) fix aliyun cloud typeerror (refs: `#49846`_) - - * 93d064a Merge pull request `#49846`_ from rallytime/bp-49650 - -- * fb7fed7 referncing `#49204`_, fixing mis-spelling of lattrs on line 4514 per request from @gtmanfred -+ * fb7fed7 referencing `#49204`_, fixing mis-spelling of lattrs on line 4514 per request from @gtmanfred - - * ec9fa92 use stringutils instead of hard code - -@@ -3383,7 +3383,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * 44ee2ec Updating default for retry_dns_count - -- * 75f64a6 Removing unneccesary code. -+ * 75f64a6 Removing unnecessary code. - - * e66dc18 Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. - -@@ -3643,7 +3643,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * d40c034 Fix index error when running on Python 3 - --* **PR** `#49720`_: (`cstarke`_) Seperate prlctl and prlsrvctl checks into each requiring function -+* **PR** `#49720`_: (`cstarke`_) Separate prlctl and prlsrvctl checks into each requiring function - @ *2018-09-21 13:32:46 UTC* - - * e7bbb83 Merge pull request `#49720`_ from cstarke/2018.3 -@@ -3656,7 +3656,7 @@ Changelog for v2018.3.3..v2018.3.4 - - * 9034c4e Add import for CommandExecutionError - -- * 752b6f8 Seperate prlctl and prlsrvctl checks into each requiring function -+ * 752b6f8 Separate prlctl and prlsrvctl checks into each requiring function - - * **PR** `#49615`_: (`terminalmage`_) ping_interval: use service.restart instead of signaling - @ *2018-09-21 13:26:41 UTC* -diff --git a/doc/topics/solaris/index.rst b/doc/topics/solaris/index.rst -index 9c128edbce..94d2d1b370 100644 ---- a/doc/topics/solaris/index.rst -+++ b/doc/topics/solaris/index.rst -@@ -5,7 +5,7 @@ Solaris - This section contains details on Solaris specific quirks and workarounds. - - .. note:: -- Solaris refers to both Solaris 10 comaptible platforms like Solaris 10, illumos, SmartOS, OmniOS, OpenIndiana,... and Oracle Solaris 11 platforms. -+ Solaris refers to both Solaris 10 compatible platforms like Solaris 10, illumos, SmartOS, OmniOS, OpenIndiana,... and Oracle Solaris 11 platforms. - - .. toctree:: - :glob: -diff --git a/doc/topics/tutorials/libcloud.rst b/doc/topics/tutorials/libcloud.rst -index d3f86972d0..f000c3f56a 100644 ---- a/doc/topics/tutorials/libcloud.rst -+++ b/doc/topics/tutorials/libcloud.rst -@@ -113,7 +113,7 @@ For example, listing buckets in the Google Storage platform: - anthonypjshaw - - --The Apache Libcloud storage module can be used to syncronize files between multiple storage clouds, -+The Apache Libcloud storage module can be used to synchronize files between multiple storage clouds, - such as Google Storage, S3 and OpenStack Swift - - .. code-block:: bash -diff --git a/salt/beacons/avahi_announce.py b/salt/beacons/avahi_announce.py -index 1806164a06..d200cded88 100644 ---- a/salt/beacons/avahi_announce.py -+++ b/salt/beacons/avahi_announce.py -@@ -89,7 +89,7 @@ def _enforce_txt_record_maxlen(key, value): - the maximum permitted length. In case of truncation, '...' is - appended to indicate that the entire value is not present. - ''' -- # Add 1 for '=' seperator between key and value -+ # Add 1 for '=' separator between key and value - if len(key) + len(value) + 1 > 255: - # 255 - 3 ('...') - 1 ('=') = 251 - return value[:251 - len(key)] + '...' -diff --git a/salt/beacons/bonjour_announce.py b/salt/beacons/bonjour_announce.py -index e1f1d83fe4..2370929aa9 100644 ---- a/salt/beacons/bonjour_announce.py -+++ b/salt/beacons/bonjour_announce.py -@@ -83,7 +83,7 @@ def _enforce_txt_record_maxlen(key, value): - the maximum permitted length. In case of truncation, '...' is - appended to indicate that the entire value is not present. - ''' -- # Add 1 for '=' seperator between key and value -+ # Add 1 for '=' separator between key and value - if len(key) + len(value) + 1 > 255: - # 255 - 3 ('...') - 1 ('=') = 251 - return value[:251 - len(key)] + '...' -diff --git a/salt/beacons/napalm_beacon.py b/salt/beacons/napalm_beacon.py -index 5d6ed7b277..84c680d006 100644 ---- a/salt/beacons/napalm_beacon.py -+++ b/salt/beacons/napalm_beacon.py -@@ -267,10 +267,10 @@ def _compare(cur_cmp, cur_struct): - return cur_cmp == cur_struct - elif isinstance(cur_struct, (six.integer_types, float)) and \ - isinstance(cur_cmp, (six.string_types, six.text_type)): -- # Comapring the numerical value agains a presumably mathematical value -+ # Comapring the numerical value against a presumably mathematical value - log.debug('Comparing a numeric value (%d) with a string (%s)', cur_struct, cur_cmp) - numeric_compare = _numeric_regex.match(cur_cmp) -- # determine if the value to compare agains is a mathematical operand -+ # determine if the value to compare against is a mathematical operand - if numeric_compare: - compare_value = numeric_compare.group(2) - return getattr(float(cur_struct), _numeric_operand[numeric_compare.group(1)])(float(compare_value)) -diff --git a/salt/cache/mysql_cache.py b/salt/cache/mysql_cache.py -index 6f9f5e69c6..b9b8206720 100644 ---- a/salt/cache/mysql_cache.py -+++ b/salt/cache/mysql_cache.py -@@ -112,7 +112,7 @@ def _create_table(): - ''' - Create table if needed - ''' -- # Explicitely check if the table already exists as the library logs a -+ # Explicitly check if the table already exists as the library logs a - # warning on CREATE TABLE - query = """SELECT COUNT(TABLE_NAME) FROM information_schema.tables - WHERE table_schema = '{0}' AND table_name = '{1}'""".format( -diff --git a/salt/cloud/clouds/clc.py b/salt/cloud/clouds/clc.py -index e3dff0ed85..7b1693d13f 100644 ---- a/salt/cloud/clouds/clc.py -+++ b/salt/cloud/clouds/clc.py -@@ -284,7 +284,7 @@ def avail_sizes(call=None): - - def get_build_status(req_id, nodename): - ''' -- get the build status from CLC to make sure we dont return to early -+ get the build status from CLC to make sure we don't return to early - ''' - counter = 0 - req_id = six.text_type(req_id) -diff --git a/salt/cloud/clouds/linode.py b/salt/cloud/clouds/linode.py -index 94697351d8..b86ced3d71 100644 ---- a/salt/cloud/clouds/linode.py -+++ b/salt/cloud/clouds/linode.py -@@ -1112,7 +1112,7 @@ def get_pub_key(vm_): - - def get_swap_size(vm_): - r''' -- Returns the amoutn of swap space to be used in MB. -+ Returns the amount of swap space to be used in MB. - - vm\_ - The VM profile to obtain the swap size from. -diff --git a/salt/cloud/clouds/nova.py b/salt/cloud/clouds/nova.py -index 737abd9f8e..378045ed4e 100644 ---- a/salt/cloud/clouds/nova.py -+++ b/salt/cloud/clouds/nova.py -@@ -840,7 +840,7 @@ def _query_node_data(vm_, data, conn): - # Conditions to pass this - # - # Rackconnect v2: vm_['rackconnect'] = True -- # If this is True, then the server will not be accessible from the ipv4 addres in public_ips. -+ # If this is True, then the server will not be accessible from the ipv4 address in public_ips. - # That interface gets turned off, and an ipv4 from the dedicated firewall is routed to the - # server. In this case we can use the private_ips for ssh_interface, or the access_ip. - # -diff --git a/salt/cloud/clouds/proxmox.py b/salt/cloud/clouds/proxmox.py -index 71e161773e..c37b857a25 100644 ---- a/salt/cloud/clouds/proxmox.py -+++ b/salt/cloud/clouds/proxmox.py -@@ -621,7 +621,7 @@ def create(vm_): - def _import_api(): - ''' - Download https:///pve-docs/api-viewer/apidoc.js -- Extract content of pveapi var (json formated) -+ Extract content of pveapi var (json formatted) - Load this json content into global variable "api" - ''' - global api -diff --git a/salt/cloud/clouds/xen.py b/salt/cloud/clouds/xen.py -index 6f23b813a7..797acfdbec 100644 ---- a/salt/cloud/clouds/xen.py -+++ b/salt/cloud/clouds/xen.py -@@ -201,7 +201,7 @@ def list_nodes(): - except Exception: - base_template_name = None - log.debug( -- 'VM %s, doesnt have base_template_name attribute', -+ "VM %s, doesn't have base_template_name attribute", - record['name_label'] - ) - ret[record['name_label']] = {'id': record['uuid'], -@@ -325,7 +325,7 @@ def list_nodes_full(session=None): - except Exception: - base_template_name = None - log.debug( -- 'VM %s, doesnt have base_template_name attribute', -+ "VM %s, doesn't have base_template_name attribute", - record['name_label'] - ) - vm_cfg = session.xenapi.VM.get_record(vm) -@@ -492,7 +492,7 @@ def show_instance(name, session=None, call=None): - except Exception: - base_template_name = None - log.debug( -- 'VM %s, doesnt have base_template_name attribute', -+ "VM %s, doesn't have base_template_name attribute", - record['name_label'] - ) - ret = {'id': record['uuid'], -diff --git a/salt/cloud/deploy/bootstrap-salt.sh b/salt/cloud/deploy/bootstrap-salt.sh -index d52abe2ac4..55f7a26512 100755 ---- a/salt/cloud/deploy/bootstrap-salt.sh -+++ b/salt/cloud/deploy/bootstrap-salt.sh -@@ -344,7 +344,7 @@ __usage() { - with -c and -k - -C Only run the configuration function. Implies -F (forced overwrite). - To overwrite Master or Syndic configs, -M or -S, respectively, must -- also be specified. Salt installation will be ommitted, but some of the -+ also be specified. Salt installation will be omitted, but some of the - dependencies could be installed to write configuration with -j or -J. - -A Pass the salt-master DNS name or IP. This will be stored under - \${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf -@@ -2480,7 +2480,7 @@ __install_pip_pkgs() { - # PARAMETERS: requirements_file - #---------------------------------------------------------------------------------------------------------------------- - __install_pip_deps() { -- # Install virtualenv to system pip before activating virtualenv if thats going to be used -+ # Install virtualenv to system pip before activating virtualenv if that's going to be used - # We assume pip pkg is installed since that is distro specific - if [ "$_VIRTUALENV_DIR" != "null" ]; then - if ! __check_command_exists pip; then -diff --git a/salt/log/handlers/sentry_mod.py b/salt/log/handlers/sentry_mod.py -index c4f8e4de74..5f6b6e992f 100644 ---- a/salt/log/handlers/sentry_mod.py -+++ b/salt/log/handlers/sentry_mod.py -@@ -8,7 +8,7 @@ - This module provides a `Sentry`_ logging handler. Sentry is an open source - error tracking platform that provides deep context about exceptions that - happen in production. Details about stack traces along with the context -- variables available at the time of the exeption are easily browsable and -+ variables available at the time of the exception are easily browsable and - filterable from the online interface. For more details please see - `Sentry`_. - -diff --git a/salt/modules/capirca_acl.py b/salt/modules/capirca_acl.py -index 65726df1fa..ada452e001 100644 ---- a/salt/modules/capirca_acl.py -+++ b/salt/modules/capirca_acl.py -@@ -447,7 +447,7 @@ def _merge_list_of_dict(first, second, prepend=True): - if first and not second: - return first - # Determine overlaps -- # So we dont change the position of the existing terms/filters -+ # So we don't change the position of the existing terms/filters - overlaps = [] - merged = [] - appended = [] -diff --git a/salt/modules/dockermod.py b/salt/modules/dockermod.py -index f5998be051..2f37cda9a9 100644 ---- a/salt/modules/dockermod.py -+++ b/salt/modules/dockermod.py -@@ -3342,7 +3342,7 @@ def run_container(image, - exc_info.setdefault('other_errors', []).append( - 'Failed to auto_remove container: {0}'.format(rm_exc) - ) -- # Raise original exception with additonal info -+ # Raise original exception with additional info - raise CommandExecutionError(exc.__str__(), info=exc_info) - - # Start the container -@@ -3961,7 +3961,7 @@ def build(path=None, - 'The \'image\' argument to docker.build has been deprecated, ' - 'please use \'repository\' instead.' - ) -- respository = image -+ repository = image - - if repository or tag: - if not repository and tag: -@@ -4103,7 +4103,7 @@ def commit(name, - 'The \'image\' argument to docker.commit has been deprecated, ' - 'please use \'repository\' instead.' - ) -- respository = image -+ repository = image - - if not isinstance(repository, six.string_types): - repository = six.text_type(repository) -@@ -4254,7 +4254,7 @@ def import_(source, - 'The \'image\' argument to docker.import has been deprecated, ' - 'please use \'repository\' instead.' - ) -- respository = image -+ repository = image - - if not isinstance(repository, six.string_types): - repository = six.text_type(repository) -@@ -4353,7 +4353,7 @@ def load(path, repository=None, tag=None, image=None): - - *(Only present if tag was specified and tagging was successful)* - - ``Time_Elapsed`` - Time in seconds taken to load the file -- - ``Warning`` - Message describing any problems encountered in attemp to -+ - ``Warning`` - Message describing any problems encountered in attempt to - tag the topmost layer - - *(Only present if tag was specified and tagging failed)* -@@ -4372,7 +4372,7 @@ def load(path, repository=None, tag=None, image=None): - 'The \'image\' argument to docker.load has been deprecated, ' - 'please use \'repository\' instead.' - ) -- respository = image -+ repository = image - - if (repository or tag) and not (repository and tag): - # Have to have both or neither -@@ -4974,7 +4974,7 @@ def tag_(name, repository, tag='latest', force=False, image=None): - 'The \'image\' argument to docker.tag has been deprecated, ' - 'please use \'repository\' instead.' - ) -- respository = image -+ repository = image - - if not isinstance(repository, six.string_types): - repository = six.text_type(repository) -diff --git a/salt/modules/highstate_doc.py b/salt/modules/highstate_doc.py -index 77a1d37848..85926ea279 100644 ---- a/salt/modules/highstate_doc.py -+++ b/salt/modules/highstate_doc.py -@@ -50,7 +50,7 @@ State example - This state does not do anything to the system! It is only used by a `proccesser` - you can use `requisites` and `order` to move your docs around the rendered file. - -- {{sls}} a file we dont want in the doc !doc_skip: -+ {{sls}} a file we don't want in the doc !doc_skip: - file.managed: - - name: /root/passwords - - contents: 'password: sadefgq34y45h56q' -@@ -79,7 +79,7 @@ Run our `makereadme.sls` state to create `/root/README.md`. - # first ensure `highstate` return without errors or changes - salt-call state.highstate - salt-call state.apply makereadme -- # or if you dont want the extra `make helpfile` state -+ # or if you don't want the extra `make helpfile` state - salt-call --out=newline_values_only salt.highstate_doc.render > /root/README.md ; chmod 0600 /root/README.md - - -diff --git a/salt/modules/junos.py b/salt/modules/junos.py -index 7d54b72808..6f4526cc7e 100644 ---- a/salt/modules/junos.py -+++ b/salt/modules/junos.py -@@ -488,7 +488,7 @@ def rollback(**kwargs): - .format(exception) - return ret - else: -- ret['message'] = 'Rollback succesfull but pre-commit check failed.' -+ ret['message'] = 'Rollback successful but pre-commit check failed.' - ret['out'] = False - return ret - -diff --git a/salt/modules/kubernetes.py b/salt/modules/kubernetes.py -index 82653534d2..33ab3dc602 100644 ---- a/salt/modules/kubernetes.py -+++ b/salt/modules/kubernetes.py -@@ -290,7 +290,7 @@ def node_add_label(node_name, label_name, label_value, **kwargs): - ''' - Set the value of the label identified by `label_name` to `label_value` on - the node identified by the name `node_name`. -- Creates the lable if not present. -+ Creates the label if not present. - - CLI Examples:: - -diff --git a/salt/modules/namecheap_dns.py b/salt/modules/namecheap_dns.py -index 8adc5691af..c3ab2af2e0 100644 ---- a/salt/modules/namecheap_dns.py -+++ b/salt/modules/namecheap_dns.py -@@ -137,7 +137,7 @@ def set_hosts(sld, tld, hosts): - - **address** - URL or IP address - - **ttl** - An integer between 60 and 60000 (default: ``1800``) - -- Additonally, the ``mxpref`` key can be present, but must be accompanied -+ Additionally, the ``mxpref`` key can be present, but must be accompanied - by an ``emailtype`` key. - - CLI Example: -diff --git a/salt/modules/napalm_network.py b/salt/modules/napalm_network.py -index f24498d6e6..0b11ef4986 100644 ---- a/salt/modules/napalm_network.py -+++ b/salt/modules/napalm_network.py -@@ -558,7 +558,7 @@ def cli(*commands, **kwargs): # pylint: disable=unused-argument - } - ) - # thus we can display the output as is -- # in case of errors, they'll be catched in the proxy -+ # in case of errors, they'll be caught in the proxy - if not raw_cli_outputs['result']: - # Error -> dispaly the output as-is. - return raw_cli_outputs -@@ -618,7 +618,7 @@ def cli(*commands, **kwargs): # pylint: disable=unused-argument - log.debug('Processed CLI output:') - log.debug(processed_cli_output) - if not processed_cli_output['result']: -- log.debug('Apparently this didnt work, returnin the raw output') -+ log.debug("Apparently this didn't work, returnin the raw output") - processed_command_output = command_output - processed_cli_outputs['comment'] += '\nUnable to process the output from {0}: {1}.'.format(command, - processed_cli_output['comment']) -@@ -642,7 +642,7 @@ def cli(*commands, **kwargs): # pylint: disable=unused-argument - log.debug('Processed CLI output:') - log.debug(processed_cli_output) - if not processed_cli_output['result']: -- log.debug('Apparently this didnt work, returning ' -+ log.debug("Apparently this didn't work, returning " - 'the raw output') - processed_command_output = command_output - processed_cli_outputs['comment'] += '\nUnable to process the output from {0}: {1}'.format(command, -@@ -652,7 +652,7 @@ def cli(*commands, **kwargs): # pylint: disable=unused-argument - log.debug('All good, %s has a nice output!', command) - processed_command_output = processed_cli_output['out'] - else: -- log.debug('Processing %s didnt fail, but didnt return' -+ log.debug("Processing %s didn't fail, but didn't return" - ' anything either. Dumping raw.', command) - processed_command_output = command_output - else: -diff --git a/salt/modules/nilrt_ip.py b/salt/modules/nilrt_ip.py -index 098f751a8c..0b2aca1624 100644 ---- a/salt/modules/nilrt_ip.py -+++ b/salt/modules/nilrt_ip.py -@@ -128,7 +128,7 @@ def _validate_ipv4(value): - - def _interface_to_service(iface): - ''' -- returns the coresponding service to given interface if exists, otherwise return None -+ returns the corresponding service to given interface if exists, otherwise return None - ''' - for _service in _get_services(): - service_info = pyconnman.ConnService(_add_path(_service)) -diff --git a/salt/modules/rpmbuild.py b/salt/modules/rpmbuild.py -index 832570e6df..e9cb031544 100644 ---- a/salt/modules/rpmbuild.py -+++ b/salt/modules/rpmbuild.py -@@ -204,7 +204,7 @@ def make_src_pkg(dest_dir, spec, sources, env=None, template=None, saltenv='base - - template - Run the spec file through a templating engine -- Optional arguement, allows for no templating engine used to be -+ Optional argument, allows for no templating engine used to be - if none is desired. - - saltenv -diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py -index daf2f5142b..17872c0647 100644 ---- a/salt/modules/saltutil.py -+++ b/salt/modules/saltutil.py -@@ -207,10 +207,10 @@ def sync_beacons(saltenv=None, refresh=True, extmod_whitelist=None, extmod_black - to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -245,10 +245,10 @@ def sync_sdb(saltenv=None, extmod_whitelist=None, extmod_blacklist=None): - other sync functions. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -299,10 +299,10 @@ def sync_modules(saltenv=None, refresh=True, extmod_whitelist=None, extmod_black - why this is necessary. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -338,10 +338,10 @@ def sync_states(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl - ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -411,10 +411,10 @@ def sync_grains(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl - refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -452,10 +452,10 @@ def sync_renderers(saltenv=None, refresh=True, extmod_whitelist=None, extmod_bla - this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -491,10 +491,10 @@ def sync_returners(saltenv=None, refresh=True, extmod_whitelist=None, extmod_bla - to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -529,10 +529,10 @@ def sync_proxymodules(saltenv=None, refresh=False, extmod_whitelist=None, extmod - Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -568,10 +568,10 @@ def sync_engines(saltenv=None, refresh=False, extmod_whitelist=None, extmod_blac - Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -606,10 +606,10 @@ def sync_thorium(saltenv=None, refresh=False, extmod_whitelist=None, extmod_blac - Set to ``False`` to prevent this refresh. - - extmod_whitelist -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -642,10 +642,10 @@ def sync_output(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl - Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -680,10 +680,10 @@ def sync_clouds(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl - synced. Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -719,10 +719,10 @@ def sync_utils(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackli - synced. Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -782,10 +782,10 @@ def sync_log_handlers(saltenv=None, refresh=True, extmod_whitelist=None, extmod_ - Set to ``False`` to prevent this refresh. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Examples: - -@@ -815,10 +815,10 @@ def sync_pillar(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl - pillar data. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - .. note:: - This function will raise an error if executed on a traditional (i.e. -diff --git a/salt/modules/swarm.py b/salt/modules/swarm.py -index ea327ce640..f5eb238148 100644 ---- a/salt/modules/swarm.py -+++ b/salt/modules/swarm.py -@@ -73,7 +73,7 @@ def swarm_init(advertise_addr=str, - listen_addr=int, - force_new_cluster=bool): - ''' -- Initalize Docker on Minion as a Swarm Manager -+ Initialize Docker on Minion as a Swarm Manager - - advertise_addr - The ip of the manager -@@ -199,7 +199,7 @@ def service_create(image=str, - The target port on the container - - published_port -- port thats published on the host/os -+ port that's published on the host/os - - CLI Example: - -diff --git a/salt/modules/textfsm_mod.py b/salt/modules/textfsm_mod.py -index f0c5c777b9..92dd3c94bb 100644 ---- a/salt/modules/textfsm_mod.py -+++ b/salt/modules/textfsm_mod.py -@@ -384,7 +384,7 @@ def index(command, - 'comment': '' - } - if not HAS_CLITABLE: -- ret['comment'] = 'TextFSM doesnt seem that has clitable embedded.' -+ ret['comment'] = "TextFSM doesn't seem that has clitable embedded." - log.error(ret['comment']) - return ret - if not platform: -diff --git a/salt/modules/vsphere.py b/salt/modules/vsphere.py -index 854a13ddc0..0c46da539a 100644 ---- a/salt/modules/vsphere.py -+++ b/salt/modules/vsphere.py -@@ -5268,7 +5268,7 @@ def _apply_cluster_dict(cluster_spec, cluster_dict, vsan_spec=None, - vsan_spec.dataEfficiencyConfig.dedupEnabled = \ - vsan_dict['dedup_enabled'] - # In all cases we need to configure the vsan on the cluster -- # directly so not to have a missmatch between vsan_spec and -+ # directly so not to have a mismatch between vsan_spec and - # cluster_spec - if not cluster_spec.vsanConfig: - cluster_spec.vsanConfig = \ -diff --git a/salt/modules/win_pkg.py b/salt/modules/win_pkg.py -index f0698b322c..ac884fa731 100644 ---- a/salt/modules/win_pkg.py -+++ b/salt/modules/win_pkg.py -@@ -1777,7 +1777,7 @@ def remove(name=None, pkgs=None, **kwargs): - found_chgs = all(name in difference for name in changed) - - if not found_chgs: -- log.warning('Expected changes for package removal may not have occured') -+ log.warning('Expected changes for package removal may not have occurred') - - # Compare the software list before and after - # Add the difference to ret -diff --git a/salt/modules/zfs.py b/salt/modules/zfs.py -index 629b3f5bc5..158adf5af4 100644 ---- a/salt/modules/zfs.py -+++ b/salt/modules/zfs.py -@@ -9,8 +9,8 @@ Module for running ZFS command - :platform: illumos,freebsd,linux - - .. versionchanged:: 2018.3.1 -- Big refactor to remove duplicate code, better type converions and improved -- consistancy in output. -+ Big refactor to remove duplicate code, better type conversions and improved -+ consistency in output. - - ''' - from __future__ import absolute_import, unicode_literals, print_function -@@ -339,7 +339,7 @@ def list_(name=None, **kwargs): - else: - opts['-S'] = kwargs_sort - if isinstance(properties, list): -- # NOTE: There can be only one -o and it takes a comma-seperated list -+ # NOTE: There can be only one -o and it takes a comma-separated list - opts['-o'] = ','.join(properties) - else: - opts['-o'] = properties -@@ -422,7 +422,7 @@ def mount(name=None, **kwargs): - - .. warning:: - -- Passing '-a' as name is deprecated and will be removed 2 verions after Fluorine. -+ Passing '-a' as name is deprecated and will be removed 2 versions after Fluorine. - - CLI Example: - -@@ -489,7 +489,7 @@ def unmount(name, **kwargs): - - .. warning:: - -- Passing '-a' as name is deprecated and will be removed 2 verions after Fluorine. -+ Passing '-a' as name is deprecated and will be removed 2 versions after Fluorine. - - CLI Example: - -diff --git a/salt/modules/zpool.py b/salt/modules/zpool.py -index 64de2194f9..97d16f76c7 100644 ---- a/salt/modules/zpool.py -+++ b/salt/modules/zpool.py -@@ -9,8 +9,8 @@ Module for running ZFS zpool command - :platform: illumos,freebsd,linux - - .. versionchanged:: 2018.3.1 -- Big refactor to remove duplicate code, better type converions and improved -- consistancy in output. -+ Big refactor to remove duplicate code, better type conversions and improved -+ consistency in output. - - ''' - from __future__ import absolute_import, print_function, unicode_literals -@@ -294,7 +294,7 @@ def iostat(zpool=None, sample_time=5, parsable=True): - 'name', - 'capacity-alloc', 'capacity-free', - 'operations-read', 'operations-write', -- 'bandwith-read', 'bandwith-write', -+ 'bandwidth-read', 'bandwidth-write', - ] - root_vdev = None - vdev = None -diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py -index 0dd7b9deef..1a3cfe3fd2 100644 ---- a/salt/modules/zypper.py -+++ b/salt/modules/zypper.py -@@ -60,7 +60,7 @@ def __virtual__(): - Set the virtual pkg module if the os is openSUSE - ''' - if __grains__.get('os_family', '') != 'Suse': -- return (False, "Module zypper: non SUSE OS not suppored by zypper package manager") -+ return (False, "Module zypper: non SUSE OS not supported by zypper package manager") - # Not all versions of SUSE use zypper, check that it is available - if not salt.utils.path.which('zypper'): - return (False, "Module zypper: zypper package manager not found") -@@ -79,7 +79,7 @@ class _Zypper(object): - 100: 'Patches are available for installation.', - 101: 'Security patches are available for installation.', - 102: 'Installation successful, reboot required.', -- 103: 'Installation succesful, restart of the package manager itself required.', -+ 103: 'Installation successful, restart of the package manager itself required.', - } - - WARNING_EXIT_CODES = { -diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py -index b7ccf0c51d..c751869a17 100644 ---- a/salt/netapi/rest_cherrypy/app.py -+++ b/salt/netapi/rest_cherrypy/app.py -@@ -712,7 +712,7 @@ def salt_api_acl_tool(username, request): - ''' - failure_str = ("[api_acl] Authentication failed for " - "user {0} from IP {1}") -- success_str = ("[api_acl] Authentication sucessful for " -+ success_str = ("[api_acl] Authentication successful for " - "user {0} from IP {1}") - pass_str = ("[api_acl] Authentication not checked for " - "user {0} from IP {1}") -diff --git a/salt/netapi/rest_tornado/saltnado.py b/salt/netapi/rest_tornado/saltnado.py -index 53c2b197ab..5a1339d2a6 100644 ---- a/salt/netapi/rest_tornado/saltnado.py -+++ b/salt/netapi/rest_tornado/saltnado.py -@@ -131,7 +131,7 @@ The following example (in JSON format) causes Salt to execute two commands:: - }] - - Multiple commands in a Salt API request will be executed in serial and makes --no gaurantees that all commands will run. Meaning that if test.fib (from the -+no guarantees that all commands will run. Meaning that if test.fib (from the - example above) had an exception, the API would still execute "jobs.lookup_jid". - - Responses to these lowstates are an in-order list of dicts containing the -diff --git a/salt/pillar/ec2_pillar.py b/salt/pillar/ec2_pillar.py -index ac3781cf36..8d534de3f1 100644 ---- a/salt/pillar/ec2_pillar.py -+++ b/salt/pillar/ec2_pillar.py -@@ -154,7 +154,7 @@ def ext_pillar(minion_id, - # we have an untrusted grain_instance_id, use it to narrow the search - # even more. Combination will be unique even if uqdn is set. - find_filter.update({'instance-id': grain_instance_id}) -- # Add this if running state is not dependant on EC2Config -+ # Add this if running state is not dependent on EC2Config - # find_filter.update('instance-state-name': 'running') - - # no minion-id is instance-id and no suitable filter, try use_grain if enabled -diff --git a/salt/returners/elasticsearch_return.py b/salt/returners/elasticsearch_return.py -index 76ea93cfe3..2e56cd8bd5 100644 ---- a/salt/returners/elasticsearch_return.py -+++ b/salt/returners/elasticsearch_return.py -@@ -250,7 +250,7 @@ def returner(ret): - # Init the state counts - if options['states_count']: - counts = { -- 'suceeded': 0, -+ 'succeeded': 0, - 'failed': 0, - } - -@@ -295,7 +295,7 @@ def returner(ret): - if state_data['result'] is False: - counts['failed'] += 1 - else: -- counts['suceeded'] += 1 -+ counts['succeeded'] += 1 - - # Ensure the index exists - _ensure_index(index) -diff --git a/salt/returners/local_cache.py b/salt/returners/local_cache.py -index 9eeb044c8d..d8470a0be6 100644 ---- a/salt/returners/local_cache.py -+++ b/salt/returners/local_cache.py -@@ -239,7 +239,7 @@ def save_minions(jid, minions, syndic_id=None): - ''' - Save/update the serialized list of minions for a given job - ''' -- # Ensure we have a list for Python 3 compatability -+ # Ensure we have a list for Python 3 compatibility - minions = list(minions) - - log.debug( -diff --git a/salt/runners/queue.py b/salt/runners/queue.py -index 3440335b7f..cf81568a88 100644 ---- a/salt/runners/queue.py -+++ b/salt/runners/queue.py -@@ -247,7 +247,7 @@ def insert_runner(fun, args=None, kwargs=None, queue=None, backend=None): - The runner function that is going to be run - - args -- list or comma-seperated string of args to send to fun -+ list or comma-separated string of args to send to fun - - kwargs - dictionary of keyword arguments to send to fun -diff --git a/salt/runners/saltutil.py b/salt/runners/saltutil.py -index 4a6e7b3ed2..efc7a0b9b6 100644 ---- a/salt/runners/saltutil.py -+++ b/salt/runners/saltutil.py -@@ -75,10 +75,10 @@ def sync_modules(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -99,10 +99,10 @@ def sync_states(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -123,10 +123,10 @@ def sync_grains(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -147,10 +147,10 @@ def sync_renderers(saltenv='base', extmod_whitelist=None, extmod_blacklist=None) - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -171,10 +171,10 @@ def sync_returners(saltenv='base', extmod_whitelist=None, extmod_blacklist=None) - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -195,10 +195,10 @@ def sync_output(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -219,10 +219,10 @@ def sync_proxymodules(saltenv='base', extmod_whitelist=None, extmod_blacklist=No - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -243,10 +243,10 @@ def sync_runners(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -267,10 +267,10 @@ def sync_wheel(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -291,10 +291,10 @@ def sync_engines(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -317,10 +317,10 @@ def sync_thorium(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -341,10 +341,10 @@ def sync_queues(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -365,10 +365,10 @@ def sync_pillar(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -391,10 +391,10 @@ def sync_utils(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -417,10 +417,10 @@ def sync_sdb(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -463,10 +463,10 @@ def sync_cache(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -489,10 +489,10 @@ def sync_fileserver(saltenv='base', extmod_whitelist=None, extmod_blacklist=None - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -515,10 +515,10 @@ def sync_clouds(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -541,10 +541,10 @@ def sync_roster(saltenv='base', extmod_whitelist=None, extmod_blacklist=None): - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -@@ -567,10 +567,10 @@ def sync_eauth_tokens(saltenv='base', extmod_whitelist=None, extmod_blacklist=No - one environment, pass a comma-separated list. - - extmod_whitelist : None -- comma-seperated list of modules to sync -+ comma-separated list of modules to sync - - extmod_blacklist : None -- comma-seperated list of modules to blacklist based on type -+ comma-separated list of modules to blacklist based on type - - CLI Example: - -diff --git a/salt/states/docker_image.py b/salt/states/docker_image.py -index edbcba58a6..ad37c500e3 100644 ---- a/salt/states/docker_image.py -+++ b/salt/states/docker_image.py -@@ -159,7 +159,7 @@ def present(name, - sls - Allow for building of image with :py:func:`docker.sls_build - ` by specifying the SLS files with -- which to build. This can be a list or comma-seperated string. -+ which to build. This can be a list or comma-separated string. - - .. code-block:: yaml - -diff --git a/salt/states/infoblox_a.py b/salt/states/infoblox_a.py -index 07ae628281..e062aa928d 100644 ---- a/salt/states/infoblox_a.py -+++ b/salt/states/infoblox_a.py -@@ -1,6 +1,6 @@ - # -*- coding: utf-8 -*- - ''' --Infoblox A record managment. -+Infoblox A record management. - - functions accept api_opts: - -diff --git a/salt/states/infoblox_cname.py b/salt/states/infoblox_cname.py -index ce64fc62d3..46bcc41ef5 100644 ---- a/salt/states/infoblox_cname.py -+++ b/salt/states/infoblox_cname.py -@@ -1,6 +1,6 @@ - # -*- coding: utf-8 -*- - ''' --Infoblox CNAME managment. -+Infoblox CNAME management. - - functions accept api_opts: - -diff --git a/salt/states/infoblox_host_record.py b/salt/states/infoblox_host_record.py -index f61ba499e3..74cd26bbeb 100644 ---- a/salt/states/infoblox_host_record.py -+++ b/salt/states/infoblox_host_record.py -@@ -1,6 +1,6 @@ - # -*- coding: utf-8 -*- - ''' --Infoblox host record managment. -+Infoblox host record management. - - functions accept api_opts: - -diff --git a/salt/states/infoblox_range.py b/salt/states/infoblox_range.py -index 4b11c147e3..88ab669021 100644 ---- a/salt/states/infoblox_range.py -+++ b/salt/states/infoblox_range.py -@@ -1,6 +1,6 @@ - # -*- coding: utf-8 -*- - ''' --Infoblox host record managment. -+Infoblox host record management. - - functions accept api_opts: - -diff --git a/salt/states/mssql_login.py b/salt/states/mssql_login.py -index 7ebc40fda0..78dfef44f1 100644 ---- a/salt/states/mssql_login.py -+++ b/salt/states/mssql_login.py -@@ -36,7 +36,7 @@ def _normalize_options(options): - - def present(name, password=None, domain=None, server_roles=None, options=None, **kwargs): - ''' -- Checks existance of the named login. -+ Checks existence of the named login. - If not present, creates the login with the specified roles and options. - - name -diff --git a/salt/states/mssql_user.py b/salt/states/mssql_user.py -index 70108ab1a9..fa20fdf6a1 100644 ---- a/salt/states/mssql_user.py -+++ b/salt/states/mssql_user.py -@@ -36,7 +36,7 @@ def _normalize_options(options): - - def present(name, login=None, domain=None, database=None, roles=None, options=None, **kwargs): - ''' -- Checks existance of the named user. -+ Checks existence of the named user. - If not present, creates the user with the specified roles and options. - - name -diff --git a/salt/states/netusers.py b/salt/states/netusers.py -index 58b3751c6b..39f91cf917 100644 ---- a/salt/states/netusers.py -+++ b/salt/states/netusers.py -@@ -170,7 +170,7 @@ def managed(name, users=None, defaults=None): - - ''' - Manages the configuration of the users on the device, as specified in the state SLS file. Users not defined in that -- file will be remove whilst users not configured on the device, will be added. -+ file will be removed whilst users not configured on the device, will be added. - - SLS Example: - -diff --git a/salt/states/zabbix_mediatype.py b/salt/states/zabbix_mediatype.py -index 70b20e9907..32d248b641 100644 ---- a/salt/states/zabbix_mediatype.py -+++ b/salt/states/zabbix_mediatype.py -@@ -63,7 +63,7 @@ def present(name, mediatype, **kwargs): - } - } - -- # Zabbix API expects script parameters as a string of arguments seperated by newline characters -+ # Zabbix API expects script parameters as a string of arguments separated by newline characters - if 'exec_params' in kwargs: - if isinstance(kwargs['exec_params'], list): - kwargs['exec_params'] = '\n'.join(kwargs['exec_params'])+'\n' -diff --git a/salt/states/zabbix_usermacro.py b/salt/states/zabbix_usermacro.py -index d37017ec5d..67f3f5c0c0 100644 ---- a/salt/states/zabbix_usermacro.py -+++ b/salt/states/zabbix_usermacro.py -@@ -70,7 +70,7 @@ def present(name, value, hostid=None, **kwargs): - } - } - -- # Zabbix API expects script parameters as a string of arguments seperated by newline characters -+ # Zabbix API expects script parameters as a string of arguments separated by newline characters - if 'exec_params' in kwargs: - if isinstance(kwargs['exec_params'], list): - kwargs['exec_params'] = '\n'.join(kwargs['exec_params'])+'\n' -diff --git a/salt/states/zfs.py b/salt/states/zfs.py -index 07d7188e93..f94287b566 100644 ---- a/salt/states/zfs.py -+++ b/salt/states/zfs.py -@@ -9,8 +9,8 @@ States for managing zfs datasets - - .. versionadded:: 2016.3.0 - .. versionchanged:: 2018.3.1 -- Big refactor to remove duplicate code, better type converions and improved -- consistancy in output. -+ Big refactor to remove duplicate code, better type conversions and improved -+ consistency in output. - - .. code-block:: yaml - -diff --git a/salt/states/zpool.py b/salt/states/zpool.py -index 02e281c3fb..2ef61a9b42 100644 ---- a/salt/states/zpool.py -+++ b/salt/states/zpool.py -@@ -9,8 +9,8 @@ States for managing zpools - - .. versionadded:: 2016.3.0 - .. versionchanged:: 2018.3.1 -- Big refactor to remove duplicate code, better type converions and improved -- consistancy in output. -+ Big refactor to remove duplicate code, better type conversions and improved -+ consistency in output. - - .. code-block:: yaml - -@@ -186,7 +186,7 @@ def present(name, properties=None, filesystem_properties=None, layout=None, conf - - The following configuration properties can be toggled in the config parameter. - - import (true) - try to import the pool before creating it if absent -- - import_dirs (None) - specify additional locations to scan for devices on import (comma-seperated) -+ - import_dirs (None) - specify additional locations to scan for devices on import (comma-separated) - - device_dir (None, SunOS=/dev/dsk, Linux=/dev) - specify device directory to prepend for none - absolute device paths - - force (false) - try to force the import or creation -diff --git a/salt/tops/saltclass.py b/salt/tops/saltclass.py -index 4d480e895b..cd8b429aca 100644 ---- a/salt/tops/saltclass.py -+++ b/salt/tops/saltclass.py -@@ -42,7 +42,7 @@ Terms usable in yaml files Description - ========================== =========== - classes A list of classes that will be processed in order - states A list of states that will be returned by master_tops function --pillars A yaml dictionnary that will be returned by the ext_pillar function -+pillars A yaml dictionary that will be returned by the ext_pillar function - environment Node saltenv that will be used by master_tops - ========================== =========== - -@@ -64,8 +64,8 @@ This means that ``default.users`` class name will correspond to one of these: - - ``/classes/default/users.yml`` - - ``/classes/default/users/init.yml`` - --Saltclass file hierachy --======================= -+Saltclass file hierarchy -+======================== - - A saltclass tree would look like this: - -diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py -index f1f844bca0..1c52c635c0 100644 ---- a/salt/transport/ipc.py -+++ b/salt/transport/ipc.py -@@ -183,7 +183,7 @@ class IPCServer(object): - # On occasion an exception will occur with - # an error code of 0, it's a spurious exception. - if exc.errno == 0: -- log.trace('Exception occured with error number 0, ' -+ log.trace('Exception occurred with error number 0, ' - 'spurious exception: %s', exc) - else: - log.error('Exception occurred while ' -diff --git a/salt/utils/pkg/win.py b/salt/utils/pkg/win.py -index 38f0c1adeb..f81f1aa36b 100644 ---- a/salt/utils/pkg/win.py -+++ b/salt/utils/pkg/win.py -@@ -703,7 +703,7 @@ class WinSoftware(object): - Returns the raw data - - Returns: -- dict: contents of the dict are dependant on the parameters passed -+ dict: contents of the dict are dependent on the parameters passed - when the class was initiated. - ''' - return self.__reg_software -diff --git a/salt/utils/raetevent.py b/salt/utils/raetevent.py -index eb1569b953..477ba54410 100644 ---- a/salt/utils/raetevent.py -+++ b/salt/utils/raetevent.py -@@ -278,7 +278,7 @@ class RAETEvent(object): - - def close_pub(self): - ''' -- Here for compatability -+ Here for compatibility - ''' - return - -diff --git a/salt/utils/state.py b/salt/utils/state.py -index b90f36beaa..37cfe98664 100644 ---- a/salt/utils/state.py -+++ b/salt/utils/state.py -@@ -86,7 +86,7 @@ def check_onfail_requisites(state_id, state_result, running, highstate): - - Returns: - -- True: if onfail handlers suceeded -+ True: if onfail handlers succeeded - False: if one on those handler failed - None: if the state does not have onfail requisites - -diff --git a/salt/utils/stringutils.py b/salt/utils/stringutils.py -index 50f6bd4f32..9b9cf4512d 100644 ---- a/salt/utils/stringutils.py -+++ b/salt/utils/stringutils.py -@@ -213,7 +213,7 @@ def dequote(value): - @jinja_filter('is_hex') - def is_hex(value): - ''' -- Returns True if value is a hexidecimal string, otherwise returns False -+ Returns True if value is a hexadecimal string, otherwise returns False - ''' - try: - int(value, 16) -diff --git a/salt/utils/vault.py b/salt/utils/vault.py -index cf8c84fcfa..590f24570d 100644 ---- a/salt/utils/vault.py -+++ b/salt/utils/vault.py -@@ -110,7 +110,7 @@ def get_vault_connection(): - payload['secret_id'] = __opts__['vault']['auth']['secret_id'] - response = requests.post(url, json=payload, verify=verify) - if response.status_code != 200: -- errmsg = 'An error occured while getting a token from approle' -+ errmsg = 'An error occurred while getting a token from approle' - raise salt.exceptions.CommandExecutionError(errmsg) - __opts__['vault']['auth']['token'] = response.json()['auth']['client_token'] - return { -diff --git a/salt/utils/xmlutil.py b/salt/utils/xmlutil.py -index 6d8d74fd3f..68dd9e11a5 100644 ---- a/salt/utils/xmlutil.py -+++ b/salt/utils/xmlutil.py -@@ -23,7 +23,7 @@ def _to_dict(xmltree): - ''' - Converts an XML ElementTree to a dictionary that only contains items. - This is the default behavior in version 2017.7. This will default to prevent -- unexpected parsing issues on modules dependant on this. -+ unexpected parsing issues on modules dependent on this. - ''' - # If this object has no children, the for..loop below will return nothing - # for it, so just return a single dict representing it. -diff --git a/salt/utils/zfs.py b/salt/utils/zfs.py -index b0d1af15f3..77da6e7cf7 100644 ---- a/salt/utils/zfs.py -+++ b/salt/utils/zfs.py -@@ -348,7 +348,7 @@ def property_data_zpool(): - zpool_size_extra = [ - 'capacity-alloc', 'capacity-free', - 'operations-read', 'operations-write', -- 'bandwith-read', 'bandwith-write', -+ 'bandwidth-read', 'bandwidth-write', - 'read', 'write', - ] - zpool_numeric_extra = [ -diff --git a/tests/integration/minion/test_pillar.py b/tests/integration/minion/test_pillar.py -index f2b111f75a..a924ea99bc 100644 ---- a/tests/integration/minion/test_pillar.py -+++ b/tests/integration/minion/test_pillar.py -@@ -319,7 +319,7 @@ class DecryptGPGPillarTest(ModuleCase): - ''' - Test recursive decryption of secrets:vault, with the renderer - explicitly defined, overriding the default. Setting the default to a -- nonexistant renderer so we can be sure that the override happened. -+ nonexistent renderer so we can be sure that the override happened. - ''' - decrypt_pillar_opts = salt.utils.yaml.safe_load(textwrap.dedent('''\ - decrypt_pillar_default: asdf -diff --git a/tests/integration/modules/test_win_pkg.py b/tests/integration/modules/test_win_pkg.py -index 8e20bfba3f..5e73f5442e 100644 ---- a/tests/integration/modules/test_win_pkg.py -+++ b/tests/integration/modules/test_win_pkg.py -@@ -25,7 +25,7 @@ class WinPKGTest(ModuleCase): - Tests for salt.modules.win_pkg. There are already - some pkg execution module tests in the the test - integration.modules.test_pkg but this will be for -- specific windows software respository tests while -+ specific windows software repository tests while - using the win_pkg module. - ''' - @destructiveTest -diff --git a/tests/integration/runners/test_state.py b/tests/integration/runners/test_state.py -index d41909c180..cda04de3e2 100644 ---- a/tests/integration/runners/test_state.py -+++ b/tests/integration/runners/test_state.py -@@ -216,12 +216,12 @@ class StateRunnerTest(ShellCase): - ' Result: False'): - self.assertIn(result, ret) - -- def test_orchestrate_target_doesnt_exist(self): -+ def test_orchestrate_target_does_not_exist(self): - ''' - test orchestration when target doesn't exist - while using multiple states - ''' -- ret = self.run_run('state.orchestrate orch.target-doesnt-exists') -+ ret = self.run_run('state.orchestrate orch.target-does-not-exists') - - first = ['No minions matched the target. No command was sent, no jid was assigned.', - ' ID: core', -@@ -476,7 +476,7 @@ class OrchEventTest(ShellCase): - continue - - # if we receive the ret for this job before self.timeout (60), -- # the test is implicitly sucessful; if it were happening in serial it would be -+ # the test is implicitly successful; if it were happening in serial it would be - # atleast 110 seconds. - if event['tag'] == 'salt/run/{0}/ret'.format(jid): - received = True -diff --git a/tests/integration/states/test_file.py b/tests/integration/states/test_file.py -index f4fca4c887..dfcf184ab9 100644 ---- a/tests/integration/states/test_file.py -+++ b/tests/integration/states/test_file.py -@@ -625,7 +625,7 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin): - remove_file() - - remove_file() -- log.debug('Trying with nonexistant destination file') -+ log.debug('Trying with nonexistent destination file') - do_test() - log.debug('Trying with destination file already present') - with salt.utils.files.fopen(name, 'w'): -diff --git a/tests/integration/states/test_git.py b/tests/integration/states/test_git.py -index b2f9e04321..c4799dc589 100644 ---- a/tests/integration/states/test_git.py -+++ b/tests/integration/states/test_git.py -@@ -124,7 +124,7 @@ class WithGitMirror(object): - # Run the actual function with three arguments added: - # 1. URL for the test to use to clone - # 2. Cloned admin dir for making/pushing changes to the mirror -- # 3. Yet-nonexistant clone_dir for the test function to use as a -+ # 3. Yet-nonexistent clone_dir for the test function to use as a - # destination for cloning. - return self.func(testcase, mirror_url, admin_dir, clone_dir, *args, **kwargs) - finally: -@@ -716,7 +716,7 @@ class GitTest(ModuleCase, SaltReturnAssertsMixin): - old_branch - ) - -- # Test switching to a nonexistant branch. This should fail. -+ # Test switching to a nonexistent branch. This should fail. - ret = self.run_state( - 'git.cloned', - name=TEST_REPO, -@@ -731,9 +731,9 @@ class GitTest(ModuleCase, SaltReturnAssertsMixin): - - @with_tempdir(create=False) - @ensure_min_git(min_version='1.7.10') -- def test_cloned_with_nonexistant_branch(self, target): -+ def test_cloned_with_nonexistent_branch(self, target): - ''' -- Test git.cloned state with a nonexistant branch provided -+ Test git.cloned state with a nonexistent branch provided - ''' - branch = 'thisbranchdoesnotexist' - -diff --git a/tests/support/win_installer.py b/tests/support/win_installer.py -index 4b979b6d44..30ecd6478d 100644 ---- a/tests/support/win_installer.py -+++ b/tests/support/win_installer.py -@@ -43,7 +43,7 @@ def iter_installers(content): - - def split_installer(name): - ''' -- Return a tuple of the salt version, python verison and architecture from an -+ Return a tuple of the salt version, python version and architecture from an - installer name. - ''' - x = name[len(PREFIX):] -diff --git a/tests/unit/modules/test_debian_ip.py b/tests/unit/modules/test_debian_ip.py -index f21ca41019..f38a4c636a 100644 ---- a/tests/unit/modules/test_debian_ip.py -+++ b/tests/unit/modules/test_debian_ip.py -@@ -225,7 +225,7 @@ class DebianIpTestCase(TestCase, LoaderModuleMockMixin): - 'ipv6netmask': '64', - 'ipv6gateway': '2001:db8:dead:beef::1', - 'ttl': '18', # shared -- 'ipv6ttl': '15', # overriden for v6 -+ 'ipv6ttl': '15', # overridden for v6 - 'mtu': '1480', # shared - 'enable_ipv6': True, - 'noifupdown': True, -diff --git a/tests/unit/modules/test_junos.py b/tests/unit/modules/test_junos.py -index c922a96caf..84e45fbf92 100644 ---- a/tests/unit/modules/test_junos.py -+++ b/tests/unit/modules/test_junos.py -@@ -637,7 +637,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): - patch('jnpr.junos.utils.config.Config.rollback') as mock_rollback: - mock_commit_check.return_value = False - ret = dict() -- ret['message'] = 'Rollback succesfull but pre-commit check failed.' -+ ret['message'] = 'Rollback successful but pre-commit check failed.' - ret['out'] = False - self.assertEqual(junos.rollback(), ret) - -diff --git a/tests/unit/modules/test_useradd.py b/tests/unit/modules/test_useradd.py -index 18da8d8ce8..17167a530d 100644 ---- a/tests/unit/modules/test_useradd.py -+++ b/tests/unit/modules/test_useradd.py -@@ -369,7 +369,7 @@ class UserAddTestCase(TestCase, LoaderModuleMockMixin): - ''' - Test the user information - ''' -- self.assertEqual(useradd.info('username-that-doesnt-exist'), {}) -+ self.assertEqual(useradd.info('username-that-does-not-exist'), {}) - - mock = MagicMock(return_value=pwd.struct_passwd(('_TEST_GROUP', - '*', -@@ -379,7 +379,7 @@ class UserAddTestCase(TestCase, LoaderModuleMockMixin): - '/var/virusmails', - '/usr/bin/false'))) - with patch.object(pwd, 'getpwnam', mock): -- self.assertEqual(useradd.info('username-that-doesnt-exist')['name'], '_TEST_GROUP') -+ self.assertEqual(useradd.info('username-that-does-not-exist')['name'], '_TEST_GROUP') - - # 'list_groups' function tests: 1 - -diff --git a/tests/unit/modules/test_zpool.py b/tests/unit/modules/test_zpool.py -index 5ac302eb5a..303b515941 100644 ---- a/tests/unit/modules/test_zpool.py -+++ b/tests/unit/modules/test_zpool.py -@@ -385,7 +385,7 @@ class ZpoolTestCase(TestCase, LoaderModuleMockMixin): - - def test_labelclear_success(self): - ''' -- Tests labelclear on succesful label removal -+ Tests labelclear on successful label removal - ''' - ret = {} - ret['stdout'] = "" -diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py -index 7b96bb90b2..f92eb9bdb0 100644 ---- a/tests/unit/transport/test_zeromq.py -+++ b/tests/unit/transport/test_zeromq.py -@@ -406,7 +406,7 @@ class PubServerChannel(TestCase, AdaptedConfigurationTestCaseMixin): - del cls.master_config - - def setUp(self): -- # Start the event loop, even though we dont directly use this with -+ # Start the event loop, even though we don't directly use this with - # ZeroMQPubServerChannel, having it running seems to increase the - # likely hood of dropped messages. - self.io_loop = zmq.eventloop.ioloop.ZMQIOLoop() -diff --git a/tests/unit/utils/test_pyobjects.py b/tests/unit/utils/test_pyobjects.py -index 8908d63f06..26d2a11907 100644 ---- a/tests/unit/utils/test_pyobjects.py -+++ b/tests/unit/utils/test_pyobjects.py -@@ -468,7 +468,7 @@ class MapTests(RendererMixin, TestCase, MapBuilder): - ''' - Test declarative ordering - ''' -- # With declarative ordering, the ubuntu-specfic service name should -+ # With declarative ordering, the ubuntu-specific service name should - # override the one inherited from debian. - template = self.build_map(textwrap.dedent('''\ - {{ debian }} -diff --git a/tests/unit/utils/test_zfs.py b/tests/unit/utils/test_zfs.py -index 29b3fe893f..88c1457843 100644 ---- a/tests/unit/utils/test_zfs.py -+++ b/tests/unit/utils/test_zfs.py -@@ -183,12 +183,12 @@ pmap_zpool = { - 'type': 'bool', - 'values': 'on | off' - }, -- "bandwith-read": { -+ "bandwidth-read": { - "edit": False, - "type": "size", - "values": "" - }, -- "bandwith-write": { -+ "bandwidth-write": { - "edit": False, - "type": "size", - "values": "" -diff --git a/doc/topics/releases/2017.7.0.rst b/doc/topics/releases/2017.7.0.rst -index d83031dcfa..a53bf246a4 100644 ---- a/doc/topics/releases/2017.7.0.rst -+++ b/doc/topics/releases/2017.7.0.rst -@@ -441,7 +441,7 @@ have been improved, enhanced and widenened in scope: - the process. In 2017.7.0 we have introduced the functionality to re-establish - the connection. One can disable this feature through the - :conf_proxy:`proxy_keep_alive` option and adjust the polling frequency -- speciying a custom value for :conf_proxy:`proxy_keep_alive_interval`, -+ specifying a custom value for :conf_proxy:`proxy_keep_alive_interval`, - in minutes. - - New modules: -diff --git a/salt/states/boto_ec2.py b/salt/states/boto_ec2.py -index 6623c5f522..d00e54e810 100644 ---- a/salt/states/boto_ec2.py -+++ b/salt/states/boto_ec2.py -@@ -748,7 +748,7 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None, - a public_ip instead. - allocate_eip: - (bool) - Allocate and attach an EIP on-the-fly for this instance. Note -- you'll want to releaase this address when terminating the instance, -+ you'll want to release this address when terminating the instance, - either manually or via the 'release_eip' flag to 'instance_absent'. - region - (string) - Region to connect to. -diff --git a/salt/states/network.py b/salt/states/network.py -index ec3c2fd8ed..129ef5b0eb 100644 ---- a/salt/states/network.py -+++ b/salt/states/network.py -@@ -140,7 +140,7 @@ all interfaces are ignored unless specified. - - type: eth - - proto: dhcp - - noifupdown: True # Do not restart the interface -- # you need to reboot/reconfigure manualy -+ # you need to reboot/reconfigure manually - - bond0: - network.managed: diff -Nru salt-2018.3.4+dfsg1/debian/patches/remove-privacy-breach.patch salt-2018.3.4+dfsg1/debian/patches/remove-privacy-breach.patch --- salt-2018.3.4+dfsg1/debian/patches/remove-privacy-breach.patch 2019-04-25 15:09:29.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/remove-privacy-breach.patch 2019-05-24 13:01:45.000000000 +0000 @@ -40,3 +40,13 @@ +--- a/doc/_themes/saltstack/layout.html ++++ b/doc/_themes/saltstack/layout.html +@@ -117,7 +117,6 @@ + + + +- + {{ css() }} + + {%- if not embedded %} diff -Nru salt-2018.3.4+dfsg1/debian/patches/series salt-2018.3.4+dfsg1/debian/patches/series --- salt-2018.3.4+dfsg1/debian/patches/series 2019-05-02 11:15:49.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/series 2019-05-24 13:01:45.000000000 +0000 @@ -17,10 +17,7 @@ Silence-linux_distribution-deprecation-warning.patch Skip-test_module_name_source_match.patch Fix-test_xen_virtual-on-kernels-with-no-Xen-support.patch -fix-various-spelling-mistakes.patch -doc-Set-script-type-explicitly-to-text-javascript.patch doc-fix-logo-link.patch -Use-jquery.js-from-sphinx.patch ensure-searchtools.js-gets-included.patch 0001-Import-tornado.gen-as-tornado_gen.patch 0002-Explicitly-import-attributes-from-tornado.patch diff -Nru salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch --- salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch 2019-04-25 15:09:29.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/patches/Use-jquery.js-from-sphinx.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From 0baa23a3a01291af2b78f9e123284bbdb7de0541 Mon Sep 17 00:00:00 2001 -From: Benjamin Drung -Date: Wed, 24 Apr 2019 14:49:35 +0200 -Subject: [PATCH] Use jquery.js from sphinx - -Sphinx uses libjs-jquery >= 1.11.1 which is newer than jquery-1.9.1.js -shipped by salt. Therefore jquery.js from sphinx can be used again. - -Signed-off-by: Benjamin Drung ---- - doc/_themes/saltstack/layout.html | 6 ------ - 2 files changed, 7 deletions(-) - -diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html -index 85e0a3cf..a332b7c6 100644 ---- a/doc/_themes/saltstack/layout.html -+++ b/doc/_themes/saltstack/layout.html -@@ -19,14 +19,8 @@ - {%- set titlesuffix = "" %} - {%- endif %} - --{# Remove old version of jQuery #} --{% set js_blacklist = [ -- '_static/jquery.js', --] %} -- - {# Add to top of the list #} - {% set script_files = [ -- '_static/js/vendor/jquery-1.9.1.js', - '_static/js/vendor/bootstrap.min.js', - ] + script_files %} - --- -2.20.1 - diff -Nru salt-2018.3.4+dfsg1/debian/rules salt-2018.3.4+dfsg1/debian/rules --- salt-2018.3.4+dfsg1/debian/rules 2019-04-25 15:27:28.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/rules 2019-05-24 13:01:45.000000000 +0000 @@ -3,13 +3,11 @@ #export DH_VERBOSE=1 %: - dh $@ --buildsystem pybuild --with bash-completion,python3,sphinxdoc + dh $@ --buildsystem pybuild --with bash-completion,python3 override_dh_auto_build: dh_auto_build rm -f doc/_themes/saltstack/static/css/*.min.css doc/_themes/saltstack/static/js/vendor/*.js - ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js doc/_themes/saltstack/static/js/vendor/bootstrap.min.js - ln -s /usr/share/javascript/modernizr/modernizr.min.js doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js HTML_THEME=saltstack make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build HTML_THEME=saltstack make -C doc man SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build diff -Nru salt-2018.3.4+dfsg1/debian/salt-doc.links salt-2018.3.4+dfsg1/debian/salt-doc.links --- salt-2018.3.4+dfsg1/debian/salt-doc.links 2019-04-25 15:08:50.000000000 +0000 +++ salt-2018.3.4+dfsg1/debian/salt-doc.links 2019-05-24 13:01:45.000000000 +0000 @@ -1,3 +1,9 @@ usr/share/doc/salt/html/_static/favicon.ico usr/share/doc/salt/html/favicon.ico usr/share/javascript/bootstrap/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js +usr/share/javascript/jquery/jquery.js usr/share/doc/salt/html/_static/js/vendor/jquery-1.9.1.js usr/share/javascript/modernizr/modernizr.min.js usr/share/doc/salt/html/_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js +usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/salt/html/_static/doctools.js +usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/salt/html/_static/jquery.js +usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/salt/html/_static/searchtools.js +usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/salt/html/_static/sidebar.js +usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/salt/html/_static/underscore.js