diff --git a/doc/topics/releases/2015.5.1.rst b/doc/topics/releases/2015.5.1.rst index 99826610ca..13f8b8cbe4 100644 --- a/doc/topics/releases/2015.5.1.rst +++ b/doc/topics/releases/2015.5.1.rst @@ -513,7 +513,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt * e48982f Fix version checking in psutil_compat - * 93ee411 Create compatability psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. + * 93ee411 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-16T04:03:10Z* @@ -968,7 +968,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt * 73cfda7 Remove unused import - * 52b68d6 Use the zip_longest from six module for python 3 compatiblity + * 52b68d6 Use the zip_longest from six module for python 3 compatibility * 18d5ff9 Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes diff --git a/salt/states/reg.py b/salt/states/reg.py index c4f1f69864..f38501103a 100644 --- a/salt/states/reg.py +++ b/salt/states/reg.py @@ -115,7 +115,7 @@ def present(name, - HKEY_USERS or HKU :param str value: Deprecated. Use vname and vdata instead. Included here for - backwards compatability. + backwards compatibility. :param str vname: The name of the value you'd like to create beneath the Key. If this parameter is not passed it will assume you want to set the diff --git a/salt/utils/http.py b/salt/utils/http.py index 1f69d6b224..f7b689c905 100644 --- a/salt/utils/http.py +++ b/salt/utils/http.py @@ -579,7 +579,7 @@ def get_ca_bundle(opts=None): # RedHat is also very common '/etc/pki/tls/certs/ca-bundle.crt', '/etc/pki/tls/certs/ca-bundle.trust.crt', - # RedHat's link for Debian compatability + # RedHat's link for Debian compatibility '/etc/ssl/certs/ca-bundle.crt', # Suse has an unusual path '/var/lib/ca-certificates/ca-bundle.pem',