diff --git a/doc/ext/apidoc.py b/doc/ext/apidoc.py index 0ec7d3b3db..20f208f694 100644 --- a/doc/ext/apidoc.py +++ b/doc/ext/apidoc.py @@ -24,7 +24,7 @@ from sphinx import apidoc # NOTE(dstanek): pbr will run Sphinx multiple times when it generates # documentation. Once for each builder. To run this extension we use the -# 'builder-inited' hook that fires at the begining of a Sphinx build. +# 'builder-inited' hook that fires at the beginning of a Sphinx build. # We use ``run_already`` to make sure apidocs are only generated once # even if Sphinx is run multiple times. run_already = False diff --git a/doc/source/EXTENSIONS_HOWTO.rst b/doc/source/EXTENSIONS_HOWTO.rst index a02cbc9dc7..06c76028ce 100644 --- a/doc/source/EXTENSIONS_HOWTO.rst +++ b/doc/source/EXTENSIONS_HOWTO.rst @@ -78,7 +78,7 @@ Example:: In case the Extension is overriding or re-implementing an existing portion of Keystone the required change should be commented in the `configuration.rst` but -not placed in the `keystone.conf.sample` file to avoid unecessary confusion. +not placed in the `keystone.conf.sample` file to avoid unnecessary confusion. `keystone-paste.ini` File diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 484dbff8d4..2dd1c6fd22 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -1349,7 +1349,7 @@ Read Only LDAP -------------- Many environments typically have user and group information in directories that -are accessable by LDAP. This information is for read-only use in a wide array +are accessible by LDAP. This information is for read-only use in a wide array of applications. Prior to the Havana release, we could not deploy Keystone with read-only directories as backends because Keystone also needed to store information such as projects, roles, domains and role assignments into the diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py index a06032d84d..7b4c551a80 100644 --- a/keystone/auth/plugins/token.py +++ b/keystone/auth/plugins/token.py @@ -38,14 +38,14 @@ class Token(auth.AuthMethodHandler): target=METHOD_NAME) token_id = auth_payload['id'] response = self.provider.validate_token(token_id) - #for V3 tokens, the esential data is under the 'token' value. + #for V3 tokens, the essential data is under the 'token' value. #For V2, the comparable data was nested under 'access' token_ref = response.get('token', response.get('access')) #Do not allow tokens used for delegation to #create another token, or perform any changes of #state in Keystone. TO do so is to invite elevation of - #priviledge attacks + #privilege attacks if 'OS-TRUST:trust' in token_ref: raise exception.Forbidden() if 'trust' in token_ref: diff --git a/keystone/common/kvs/backends/memcached.py b/keystone/common/kvs/backends/memcached.py index 8bf27392d6..101f7fe4ef 100644 --- a/keystone/common/kvs/backends/memcached.py +++ b/keystone/common/kvs/backends/memcached.py @@ -68,7 +68,7 @@ class MemcachedLock(object): i += 1 else: raise exception.UnexpectedError( - _('Maximum lock attempts on %s occured.') % self.key) + _('Maximum lock attempts on %s occurred.') % self.key) def release(self): client = self.client_fn() diff --git a/keystone/common/pemutils.py b/keystone/common/pemutils.py index fea7a7f4be..6ce75552b8 100755 --- a/keystone/common/pemutils.py +++ b/keystone/common/pemutils.py @@ -16,7 +16,7 @@ """ -PEM formatted data is used frequenlty in conjunction with X509 PKI as +PEM formatted data is used frequently in conjunction with X509 PKI as a data exchange mechanism for binary data. The acronym PEM stands for Privacy Enhanced Mail as defined in RFC-1421. Contrary to expectation the PEM format in common use has little to do with RFC-1421. Instead @@ -24,7 +24,7 @@ what we know as PEM format grew out of the need for a data exchange mechanism largely by the influence of OpenSSL. Other X509 implementations have adopted it. -Unfortunately PEM format has never been officialy standarized. It's +Unfortunately PEM format has never been officially standarized. It's basic format is as follows: 1) A header consisting of 5 hyphens followed by the word BEGIN and a @@ -38,7 +38,7 @@ text may be less than 64 characters. The content and format of the binary data is entirely dependent upon the type of data announced in the header and footer. -3) A footer in the exact same as the header execpt the word BEGIN is +3) A footer in the exact same as the header except the word BEGIN is replaced by END. The content name in both the header and footer should exactly match. diff --git a/keystone/tests/test_v3.py b/keystone/tests/test_v3.py index de875c3412..87dca1d040 100644 --- a/keystone/tests/test_v3.py +++ b/keystone/tests/test_v3.py @@ -994,7 +994,7 @@ class RestfulTestCase(rest.RestfulTestCase): if summary: # Trust list contains no roles, but getting a specific - # trust by ID provides the detailed reponse containing roles + # trust by ID provides the detailed response containing roles self.assertNotIn('roles', entity) self.assertIn('project_id', entity) else: