Merge "Fix many typos"

contrib/docker/docker/resources/docker_container.py

@@ -69,7 +69,7 @@ class DockerContainer(resource.Resource):
         ),
         ATTACH_STDIN: properties.Schema(
             properties.Schema.BOOLEAN,
-            _('Attach to the the process\' standard input'),
+            _('Attach to the process\' standard input'),
             default=False
         ),
         ATTACH_STDOUT: properties.Schema(

contrib/extraroute/extraroute/resources/extraroute.py

@@ -40,7 +40,7 @@ class ExtraRoute(neutron.NeutronResource):
             required=True),
         NEXTHOP: properties.Schema(
             properties.Schema.STRING,
-            description=_('Nexthop IP adddress.'),
+            description=_('Nexthop IP address.'),
             required=True)
     }
 

doc/source/pluginguide.rst

@@ -135,8 +135,8 @@ plug-in.
         }
 
 As shown above, some properties may themselves be complex and
-reference nested schema definitions.  Following are the parameters to
-to the ``Schema`` constructor; all but the first have defaults.
+reference nested schema definitions.  Following are the parameters to the
+``Schema`` constructor; all but the first have defaults.
 
 *data_type*:
 

doc/source/template_guide/functions.rst

@@ -214,8 +214,8 @@ Find an replace one string with another.
 
 Parameters
 ~~~~~~~~~~
-subsitutions : map
-    A map of subsitutions.
+substitutions : map
+    A map of substitutions.
 string: String
     The string to do the substitutions in.
 

heat/api/aws/exception.py

@@ -28,7 +28,7 @@ class HeatAPIException(webob.exc.HTTPError):
     '''
     Subclass webob HTTPError so we can correctly serialize the wsgi response
     into the http response body, using the format specified by the request.
-    Note this should not be used directly, instead use of of the subclasses
+    Note this should not be used directly, instead use the subclasses
     defined below which map to AWS API errors
     '''
     code = 400

heat/common/exception.py

@@ -158,7 +158,7 @@ class Forbidden(HeatException):
     msg_fmt = _("You are not authorized to complete this action.")
 
 
-#NOTE(bcwaldon): here for backwards-compatability, need to deprecate.
+#NOTE(bcwaldon): here for backwards-compatibility, need to deprecate.
 class NotAuthorized(Forbidden):
     msg_fmt = _("You are not authorized to complete this action.")
 

heat/common/heat_keystoneclient.py

@@ -422,8 +422,8 @@ class KeystoneClientV3(object):
         # Note v3/credentials does not support filtering by access
         # because it's stored in the credential blob, so we expect
         # all resources to pass credential_id except where backwards
-        # compatibility is required (resource only has acccess stored)
-        # then we'll have to to a brute-force lookup locally
+        # compatibility is required (resource only has access stored)
+        # then we'll have to do a brute-force lookup locally
         if credential_id:
             cred = self.client.credentials.get(credential_id)
             ec2_creds = json.loads(cred.blob)

heat/engine/api.py

@@ -173,7 +173,7 @@ def format_event(event):
 
 
 def format_notification_body(stack):
-    # some other posibilities here are:
+    # some other possibilities here are:
     # - template name
     # - template size
     # - resource count

heat/engine/cfn/functions.py

@@ -342,7 +342,7 @@ class Split(function.Function):
 
 class Replace(function.Function):
     '''
-    A function for performing string subsitutions.
+    A function for performing string substitutions.
 
     Takes the form::
 

heat/engine/parameters.py

@@ -65,7 +65,7 @@ class Schema(constr.Schema):
         self.context = context
 
     # Schema class validates default value for lists assuming list type. For
-    # comma delimited list string supported in paramaters Schema class, the
+    # comma delimited list string supported in parameters Schema class, the
     # default value has to be parsed into a list if necessary so that
     # validation works.
     def _validate_default(self):

heat/engine/resource.py

@@ -429,7 +429,8 @@ class Resource(object):
         '''
         Default implementation of Resource.preview.
 
-        This method should be overriden by child classes for specific behavior.
+        This method should be overridden by child classes for specific
+        behavior.
         '''
         return self
 
@@ -781,7 +782,7 @@ class Resource(object):
                 logger.error(_('DB error %s') % ex)
 
         # store resource in DB on transition to CREATE_IN_PROGRESS
-        # all other transistions (other than to DELETE_COMPLETE)
+        # all other transitions (other than to DELETE_COMPLETE)
         # should be handled by the update_and_save above..
         elif (action, status) in [(self.CREATE, self.IN_PROGRESS),
                                   (self.ADOPT, self.IN_PROGRESS)]:

heat/engine/resources/volume.py

@@ -294,7 +294,7 @@ class VolumeDetachTask(object):
 
         # The next check is needed for immediate reattachment when updating:
         # there might be some time between cinder marking volume as 'available'
-        # and nova removing attachment from it's own objects, so we
+        # and nova removing attachment from its own objects, so we
         # check that nova already knows that the volume is detached
         server_api = self.clients.nova().volumes
 

heat/engine/service.py

@@ -1095,7 +1095,7 @@ class EngineService(service.Service):
         for action in actions:
             self.thread_group_mgr.start(wr.stack_id, action)
 
-        # Return the watch with the state overriden to indicate success
+        # Return the watch with the state overridden to indicate success
         # We do not update the timestamps as we are not modifying the DB
         result = api.format_watch(wr)
         result[rpc_api.WATCH_STATE_VALUE] = state

heat/tests/test_api_cloudwatch.py

@@ -339,7 +339,7 @@ class WatchControllerTest(HeatTestCase):
     def test_list_metrics_filter_namespace(self):
 
         # Add a Namespace filter and change the engine response so
-        # we should get two reponses
+        # we should get two responses
         params = {'Action': 'ListMetrics',
                   'Namespace': 'atestnamespace/foo'}
         dummy_req = self._dummy_GET_request(params)

heat/tests/test_hot.py

@@ -448,7 +448,7 @@ class HOTemplateTest(HeatTestCase):
 
     def test_prevent_parameters_access(self):
         """
-        Test that the parameters section can't be accesed using the template
+        Test that the parameters section can't be accessed using the template
         as a dictionary.
         """
         expected_description = "This can be accessed"

heat/tests/test_nova_keypair.py

@@ -106,7 +106,7 @@ class NovaKeyPairTest(HeatTestCase):
         self.m.VerifyAll()
 
     def test_delete_key_not_found(self):
-        """Test delete non-existant key."""
+        """Test delete non-existent key."""
         test_res = self._get_test_resource(self.kp_template)
         test_res.resource_id = "key_name"
         test_res.state_set(test_res.CREATE, test_res.COMPLETE)

heat/tests/test_parameters.py

@@ -237,7 +237,7 @@ class ParameterTest(testtools.TestCase):
         self.assertIn('wibble', str(err))
 
     def test_map_value(self):
-        '''Happy path for value thats already a map.'''
+        '''Happy path for value that's already a map.'''
         schema = {'Type': 'Json'}
         val = {"foo": "bar", "items": [1, 2, 3]}
         p = self.new_parameter('p', schema, val)