Fix spelling mistakes

git ls-files | misspellings -f -
Source: https://github.com/lyda/misspell-check

Change-Id: Icbd2412aa65bc8135e5dcd83ee69e94f5a42f7a2

12 files changed, 13 insertions, 13 deletions

diff --git a/doc/source/api_curl_examples.rst b/doc/source/api_curl_examples.rst
index bd36dbde..1ee185bc 100644
--- a/doc/source/api_curl_examples.rst
+++ b/doc/source/api_curl_examples.rst
@@ -77,7 +77,7 @@ These examples assume a default port value of 35357, and depend on the
 GET /
 =====
 
-Disover API version information, links to documentation (PDF, HTML, WADL),
+Discover API version information, links to documentation (PDF, HTML, WADL),
 and supported media types::
 
     $ curl http://0.0.0.0:35357
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index fe66205a..3676bc7d 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -63,7 +63,7 @@ You will find sample configuration files in ``etc/``
 * default_catalog.templates
 
 From here, refer to :doc:`configuration` to choose which backend drivers to
-enable and use. Once configured, you should be able to run keystone by issueing
+enable and use. Once configured, you should be able to run keystone by issuing
 the command::
 
     keystone-all
diff --git a/doc/source/old/extensions.rst b/doc/source/old/extensions.rst
index 70692b8f..f57fd687 100644
--- a/doc/source/old/extensions.rst
+++ b/doc/source/old/extensions.rst
@@ -117,7 +117,7 @@ Creating New Extensions
 #. **Adopt a unique organization abbreviation.**
 
    This prefix should uniquely identify your organization within the community.
-   The goal is to avoid schema and resource collisions with similiar extensions.
+   The goal is to avoid schema and resource collisions with similar extensions.
    (e.g. ``OS`` for OpenStack, ``RAX`` for Rackspace, or ``HP`` for Hewlett-Packard)
 
 #. **Adopt a unique extension abbreviation.**
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py
index 7afeed95..69cb91ce 100644
--- a/keystone/catalog/core.py
+++ b/keystone/catalog/core.py
@@ -191,7 +191,7 @@ class Driver(object):
         raise exception.NotImplemented()
 
     def get_catalog(self, user_id, tenant_id, metadata=None):
-        """Retreive and format the current service catalog.
+        """Retrieve and format the current service catalog.
 
         Example::
 
diff --git a/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py
index abfe728a..42d6efa5 100644
--- a/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py
+++ b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py
@@ -25,7 +25,7 @@ ENDPOINT_TYPES = ['public', 'internal', 'admin']
 
 
 def upgrade(migrate_engine):
-    """Split each legacy endpoint into seperate records for each interface."""
+    """Split each legacy endpoint into separate records for each interface."""
     meta = sql.MetaData()
     meta.bind = migrate_engine
 
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py
index e96575d0..02a0f649 100644
--- a/keystone/contrib/ec2/core.py
+++ b/keystone/contrib/ec2/core.py
@@ -225,7 +225,7 @@ class Ec2Controller(controller.V2Controller):
         return {'credentials': self.ec2_api.list_credentials(context, user_id)}
 
     def get_credential(self, context, user_id, credential_id):
-        """Retreive a user's access/secret pair by the access key.
+        """Retrieve a user's access/secret pair by the access key.
 
         Grab the full access/secret pair for a given access key.
 
diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py
index 477de999..6c39b9d5 100644
--- a/keystone/middleware/s3_token.py
+++ b/keystone/middleware/s3_token.py
@@ -177,7 +177,7 @@ class S3Token(object):
         # NOTE(chmou): We still have the same problem we would need to
         #              change token_auth to detect if we already
         #              identified and not doing a second query and just
-        #              pass it thru to swiftauth in this case.
+        #              pass it through to swiftauth in this case.
         try:
             resp, output = self._json_request(creds_json)
         except ServiceError as e:
diff --git a/tests/legacy_essex.mysql b/tests/legacy_essex.mysql
index 457ba7e9..eade2cbf 100644
--- a/tests/legacy_essex.mysql
+++ b/tests/legacy_essex.mysql
@@ -177,7 +177,7 @@ CREATE TABLE `services` (
 
 LOCK TABLES `services` WRITE;
 /*!40000 ALTER TABLE `services` DISABLE KEYS */;
-INSERT INTO `services` VALUES ('Nova Compute Service','compute',1,'nova',NULL),('EC2 Compatability Layer','ec2',2,'ec2',NULL),('Glance Image Service','image',3,'glance',NULL),('Keystone Identity Service','identity',4,'keystone',NULL),('Swift Service','object-store',5,'swift',NULL);
+INSERT INTO `services` VALUES ('Nova Compute Service','compute',1,'nova',NULL),('EC2 Compatibility Layer','ec2',2,'ec2',NULL),('Glance Image Service','image',3,'glance',NULL),('Keystone Identity Service','identity',4,'keystone',NULL),('Swift Service','object-store',5,'swift',NULL);
 /*!40000 ALTER TABLE `services` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/tests/legacy_essex.sqlite b/tests/legacy_essex.sqlite
index 33d0de20..72326d76 100644
--- a/tests/legacy_essex.sqlite
+++ b/tests/legacy_essex.sqlite
@@ -178,7 +178,7 @@ CREATE TABLE `services` (
 
 /*!40000 ALTER TABLE `services` DISABLE KEYS */;
 INSERT INTO `services` VALUES ('Nova Compute Service','compute',1,'nova',NULL);
-INSERT INTO `services` VALUES ('EC2 Compatability Layer','ec2',2,'ec2',NULL);
+INSERT INTO `services` VALUES ('EC2 Compatibility Layer','ec2',2,'ec2',NULL);
 INSERT INTO `services` VALUES ('Glance Image Service','image',3,'glance',NULL);
 INSERT INTO `services` VALUES ('Keystone Identity Service','identity',4,'keystone',NULL);
 INSERT INTO `services` VALUES ('Swift Service','object-store',5,'swift',NULL);
diff --git a/tests/test_content_types.py b/tests/test_content_types.py
index 20bf3386..73b2fae2 100644
--- a/tests/test_content_types.py
+++ b/tests/test_content_types.py
@@ -266,7 +266,7 @@ class CoreApiTests(object):
         """Applicable to XML and JSON.
 
         However, navigating links and media-types differs between content
-        types so they need to be validated seperately.
+        types so they need to be validated separately.
 
         """
         self.assertIsNotNone(version)
@@ -278,7 +278,7 @@ class CoreApiTests(object):
         """Applicable to XML and JSON.
 
         However, navigating extension links differs between content types.
-        They need to be validated seperately with assertValidExtensionLink.
+        They need to be validated separately with assertValidExtensionLink.
 
         """
         self.assertIsNotNone(extension)
diff --git a/tests/test_exception.py b/tests/test_exception.py
index 13f626a0..dffa14ed 100644
--- a/tests/test_exception.py
+++ b/tests/test_exception.py
@@ -54,7 +54,7 @@ class ExceptionTestCase(test.TestCase):
         user-facing.
 
         This test provides a custom message to bypass docstring parsing, which
-        should be tested seperately.
+        should be tested separately.
 
         """
         for cls in [x for x in exception.__dict__.values() if callable(x)]:
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 213e3ddc..fd9f38be 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -941,7 +941,7 @@ class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
         self.user_two['password'] = new_password
         self.get_client(self.user_two)
 
-    def test_user_cant_update_other_users_passwd(self):
+    def test_user_cannot_update_other_users_passwd(self):
         from keystoneclient import exceptions as client_exceptions
 
         client = self.get_client(self.user_two)