Spelling and grammar cleanup

Change-Id: Id9af28920f10d4832a2197f5a2746897c33efa06
zbing0203 · Mar 6, 2015 · 769c991 · 769c991
1 parent e2e5b93
commit 769c991
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/keystone/resource/core.py b/keystone/resource/core.py
@@ -126,7 +126,7 @@ def assert_domain_enabled(self, domain_id, domain=None):
             raise AssertionError(_('Domain is disabled: %s') % domain_id)
 
     def assert_domain_not_federated(self, domain_id, domain):
-        """Assert the Domain's name and id do not match the resevered keyword.
+        """Assert the Domain's name and id do not match the reserved keyword.
 
         Note that the reserved keyword is defined in the configuration file,
         by default, it is 'Federated', it is also case insensitive.
@@ -1039,8 +1039,8 @@ def update_config(self, domain_id, config, group=None, option=None):
 
         The contents of the supplied config will be merged with the existing
         config for this domain, updating or creating new options if these did
-        not previously exist. If group or option are specified, then the update
-        will be limited to those specified items - and the inclusion of other
+        not previously exist. If group or option is specified, then the update
+        will be limited to those specified items and the inclusion of other
         options in the supplied config will raise an exception, as will the
         situation when those options do not already exist in the current
         config.
@@ -1058,7 +1058,7 @@ def _assert_valid_update(domain_id, config, group=None, option=None):
             self._assert_valid_group_and_option(group, option)
 
             # If a group has been specified, then the request is to
-            # explicitely only update the options in that group - so the config
+            # explicitly only update the options in that group - so the config
             # must not contain anything else. Further, that group must exist in
             # the original config. Likewise, if an option has been specified,
             # then the group in the config must only contain that option and it
@@ -1239,7 +1239,7 @@ def list_config_options(self, domain_id, group=None, option=False,
         :param domain_id: the domain for this option
         :param group: optional group option name
         :param option: optional option name. If group is None, then this
-                       paramater is ignored
+                       parameter is ignored
         :param sensitive: whether the option is sensitive
 
         :returns: list of dicts containing group, option and value
@@ -1277,7 +1277,7 @@ def delete_config_options(self, domain_id, group=None, option=None,
         :param domain_id: the domain for this option
         :param group: optional group option name
         :param option: optional option name. If group is None, then this
-                       paramater is ignored
+                       parameter is ignored
         :param sensitive: whether the option is sensitive
 
         """