Merge "Fix typos in comments and help strings"

bin/heat-keystone-setup

@@ -122,7 +122,7 @@ get_column_num() {
 get_user() {
     local username=$1
 
-    # Outut format of keystone user-list changed between essex and
+    # Output format of keystone user-list changed between essex and
     # folsom - the columns have been re-ordered (!?), so detect what
     # column to pass to get_data via get_column_num
     namecol=$(get_column_num name keystone user-list)

doc/source/getting_started/on_devstack.rst

@@ -61,7 +61,7 @@ Preparing Nova for running stacks
 ---------------------------------
 
 Enabling Heat in devstack will replace the default Nova flavors with
-flavours that the Heat example templates expect. You can see what
+flavors that the Heat example templates expect. You can see what
 those flavors are by running::
 
     nova flavor-list

doc/source/template_guide/contrib.rst

@@ -52,7 +52,7 @@ Nova Flavor Resource
 
 .. rubric:: This resource is not enabled by default.
 
-This plugin enables dynamic creation of Nova flavours through Heat. You can
+This plugin enables dynamic creation of Nova flavors through Heat. You can
 find more information in the `README
 <https://github.com/openstack/heat/blob/master/contrib/nova_flavor/nova_flavor
 /README.md>`_.

heat/engine/resources/server.py

@@ -520,7 +520,7 @@ class Server(stack_user.StackUser):
                 files=personality_files,
                 admin_pass=admin_pass)
         finally:
-            # Avoid a race condition where the thread could be cancelled
+            # Avoid a race condition where the thread could be canceled
             # before the ID is stored
             if server is not None:
                 self.resource_id_set(server.id)

heat/engine/resources/software_config/multi_part.py

@@ -56,7 +56,7 @@ class MultipartMime(software_config.SoftwareConfig):
     properties_schema = {
         PARTS: properties.Schema(
             properties.Schema.LIST,
-            _('Parts belonging to this messsage.'),
+            _('Parts belonging to this message.'),
             default=[],
             schema=properties.Schema(
                 properties.Schema.MAP,

heat/engine/resources/volume.py

@@ -667,7 +667,7 @@ class CinderVolume(Volume):
             elif new_size > vol.size:
                 if vol.attachments:
                     # NOTE(pshchelo):
-                    # this relies on current behaviour of cinder attachments,
+                    # this relies on current behavior of cinder attachments,
                     # i.e. volume attachments is a list with len<=1,
                     # so the volume can be attached only to single instance,
                     # and id of attachment is the same as id of the volume

heat/engine/service.py

@@ -357,7 +357,7 @@ class EngineService(service.Service):
 
         # Wait for all active threads to be finished
         for stack_id in self.thread_group_mgr.groups.keys():
-            # Ingore dummy service task
+            # Ignore dummy service task
             if stack_id == cfg.CONF.periodic_interval:
                 continue
             LOG.info(_("Waiting stack %s processing to be finished")
@@ -668,7 +668,7 @@ class EngineService(service.Service):
             if ResourceClass == resources.template_resource.TemplateResource:
                 # we can't validate a TemplateResource unless we instantiate
                 # it as we need to download the template and convert the
-                # paramerters into properties_schema.
+                # parameters into properties_schema.
                 continue
 
             props = properties.Properties(ResourceClass.properties_schema,
@@ -901,7 +901,7 @@ class EngineService(service.Service):
         - The user must map to a User resource defined in the requested stack
         - The user resource must validate OK against any Policy specified
         '''
-        # first check whether access is allowd by context user_id
+        # first check whether access is allowed by context user_id
         if stack.access_allowed(cnxt.user_id, resource_name):
             return True
 

heat/engine/signal_responder.py

@@ -76,7 +76,7 @@ class SignalResponder(stack_user.StackUser):
         path = self.identifier().arn_url_path()
 
         # Note the WSGI spec apparently means that the webob request we end up
-        # prcessing in the CFN API (ec2token.py) has an unquoted path, so we
+        # processing in the CFN API (ec2token.py) has an unquoted path, so we
         # need to calculate the signature with the path component unquoted, but
         # ensure the actual URL contains the quoted version...
         unquoted_path = urlparse.unquote(host_url.path + path)

heat/tests/test_api_aws.py

@@ -18,7 +18,7 @@ from heat.tests.common import HeatTestCase
 
 class AWSCommonTest(HeatTestCase):
     '''
-    Tests the api/aws common componenents
+    Tests the api/aws common components
     '''
     # The tests
     def test_format_response(self):