cloud-init-dev team mailing list archive

[do3meli <info@xxxxxxxxxxxxxxxxxx>]

do3meli has proposed merging ~d-info-e/cloud-init:fix-typos into cloud-init:master.

Requested reviews:
  cloud-init Commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~d-info-e/cloud-init/+git/cloud-init/+merge/374205
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~d-info-e/cloud-init:fix-typos into cloud-init:master.

diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 5012988..77c21de 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -501,7 +501,7 @@ class Init(object):
             # Init the handlers first
             for (_ctype, mod) in c_handlers.items():
                 if mod in c_handlers.initialized:
-                    # Avoid initing the same module twice (if said module
+                    # Avoid initiating the same module twice (if said module
                     # is registered to more than one content-type).
                     continue
                 handlers.call_begin(mod, data, frequency)
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index b668674..e47cded 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -44,7 +44,7 @@ MISSING_JINJA_PREFIX = u'CI_MISSING_JINJA_VAR/'
 
 @implements_to_string   # Needed for python2.7. Otherwise cached super.__str__
 class UndefinedJinjaVariable(JUndefined):
-    """Class used to represent any undefined jinja template varible."""
+    """Class used to represent any undefined jinja template variable."""
 
     def __str__(self):
         return u'%s%s' % (MISSING_JINJA_PREFIX, self._undefined_name)
@@ -58,7 +58,7 @@ class UndefinedJinjaVariable(JUndefined):
 
 
 def basic_render(content, params):
-    """This does sumple replacement of bash variable like templates.
+    """This does simple replacement of bash variable like templates.
 
     It identifies patterns like ${a} or $a and can also identify patterns like
     ${a.b} or $a.b which will look for a key 'b' in the dictionary rooted
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 44ee61d..0f4c36f 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -326,10 +326,10 @@ def wait_for_url(urls, max_wait=None, timeout=None,
     sleep_time_cb: call method with 2 arguments (response, loop_n) that
                    generates the next sleep time.
 
-    the idea of this routine is to wait for the EC2 metdata service to
+    the idea of this routine is to wait for the EC2 metadata service to
     come up.  On both Eucalyptus and EC2 we have seen the case where
     the instance hit the MD before the MD service was up.  EC2 seems
-    to have permenantely fixed this, though.
+    to have permanently fixed this, though.
 
     In openstack, the metadata service might be painfully slow, and
     unable to avoid hitting a timeout of even up to 10 seconds or more
@@ -338,7 +338,7 @@ def wait_for_url(urls, max_wait=None, timeout=None,
     Offset those needs with the need to not hang forever (and block boot)
     on a system where cloud-init is configured to look for EC2 Metadata
     service but is not going to find one.  It is possible that the instance
-    data host (169.254.169.254) may be firewalled off Entirely for a sytem,
+    data host (169.254.169.254) may be firewalled off Entirely for a system,
     meaning that the connection will block forever unless a timeout is set.
 
     A value of None for max_wait will retry indefinitely.