diff --git a/doc/source/using-api-v2.rst b/doc/source/using-api-v2.rst index f491daf2..2f6b3cfd 100644 --- a/doc/source/using-api-v2.rst +++ b/doc/source/using-api-v2.rst @@ -29,7 +29,7 @@ You create a valid ``keystoneclient.v2_0.client.Client`` object by passing authentication data to the constructor. Authentication and examples of common tasks are provided below. -You can generally expect that when the client needs to propogate an exception +You can generally expect that when the client needs to propagate an exception it will raise an instance of subclass of ``keystoneclient.exceptions.ClientException`` diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index ade945b8..ff1135f2 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -1063,7 +1063,7 @@ class AuthProtocol(object): cache_key = CACHE_KEY_TEMPLATE % memcache_crypt.get_cache_key(keys) data_to_store = memcache_crypt.protect_data(keys, serialized_data) - # Historically the swift cache conection used the argument + # Historically the swift cache connection used the argument # timeout= for the cache timeout, but this has been unified # with the official python memcache client with time= since # grizzly, we still need to handle folsom for a while until diff --git a/keystoneclient/service_catalog.py b/keystoneclient/service_catalog.py index 6b89fe4c..cd708e52 100644 --- a/keystoneclient/service_catalog.py +++ b/keystoneclient/service_catalog.py @@ -201,7 +201,7 @@ class ServiceCatalog(object): def get_data(self): """Get the raw catalog structure. - Get the version dependant catalog structure as it is presented within + Get the version dependent catalog structure as it is presented within the resource. :returns: list containing raw catalog data entries or None