Merge "Capitalize a Few Words"

doc/source/developing.rst

@@ -329,7 +329,7 @@ Not all of the tests in the keystone/tests/unit directory are strictly unit
 tests. Keystone intentionally includes tests that run the service locally and
 drives the entire configuration to achieve basic functional testing.
 
-For the functional tests, an in-memory key-value store or in-memory sqlite
+For the functional tests, an in-memory key-value store or in-memory SQLite
 database is used to keep the tests fast.
 
 Within the tests directory, the general structure of the backend tests is a

keystone/common/sql/migration_helpers.py

@@ -119,7 +119,7 @@ def rename_tables_with_constraints(renames, constraints, engine):
     `renames` is a dict, mapping {'to_table_name': from_table, ...}
     """
     if engine.name != 'sqlite':
-        # Sqlite doesn't support constraints, so nothing to remove.
+        # SQLite doesn't support constraints, so nothing to remove.
         remove_constraints(constraints)
 
     for to_table_name in renames:

keystone/tests/unit/config_files/backend_ldap_sql.conf

@@ -1,5 +1,5 @@
 [database]
-#For a specific location file based sqlite use:
+#For a specific location file based SQLite use:
 #connection = sqlite:////tmp/keystone.db
 #To Test MySQL:
 #connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8

keystone/tests/unit/config_files/backend_mysql.conf

@@ -1,4 +1,4 @@
-#Used for running the Migrate tests against a live Mysql Server
+#Used for running the Migrate tests against a live MySQL Server
 #See _sql_livetest.py
 [database]
 connection = mysql+pymysql://keystone:keystone@localhost/keystone_test?charset=utf8

keystone/tests/unit/config_files/backend_sql.conf

@@ -1,5 +1,5 @@
 [database]
-#For a specific location file based sqlite use:
+#For a specific location file based SQLite use:
 #connection = sqlite:////tmp/keystone.db
 #To Test MySQL:
 #connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8

keystone/tests/unit/test_sql_upgrade.py

@@ -432,7 +432,7 @@ class SqlUpgradeTests(SqlMigrateBase):
         self.assertTrue(self.does_fk_exist('assignment', 'role_id'))
         self.upgrade(62)
         if self.engine.name != 'sqlite':
-            # sqlite does not support FK deletions (or enforcement)
+            # SQLite does not support FK deletions (or enforcement)
             self.assertFalse(self.does_fk_exist('assignment', 'role_id'))
 
     def test_insert_assignment_inherited_pk(self):

keystone/tests/unit/token/test_fernet_provider.py

@@ -200,7 +200,7 @@ class TestValidate(unit.TestCase):
     def test_validate_v3_token_validation_error_exc(self):
         # When the token format isn't recognized, TokenNotFound is raised.
 
-        # A uuid string isn't a valid fernet token.
+        # A uuid string isn't a valid Fernet token.
         token_id = uuid.uuid4().hex
         self.assertRaises(exception.TokenNotFound,
                           self.token_provider_api.validate_v3_token, token_id)

keystone/token/providers/fernet/token_formatters.py

@@ -119,7 +119,7 @@ class TokenFormatter(object):
         # Restore padding on token before decoding it
         fernet_token = TokenFormatter.restore_padding(fernet_token)
 
-        # fernet tokens are base64 encoded, so we need to unpack them first
+        # Fernet tokens are base64 encoded, so we need to unpack them first
         token_bytes = base64.urlsafe_b64decode(fernet_token)
 
         # slice into the byte array to get just the timestamp