cloud-init-dev team mailing list archive

[Jeremy Bicha <jeremy@xxxxxxxxx>]

Jeremy Bicha has proposed merging ~jbicha/cloud-init:master into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~jbicha/cloud-init/+git/cloud-init/+merge/314658
-- 
Your team cloud init development team is requested to review the proposed merge of ~jbicha/cloud-init:master into cloud-init:master.

diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py
index e42799f..aa3dfe5 100644
--- a/cloudinit/config/cc_set_hostname.py
+++ b/cloudinit/config/cc_set_hostname.py
@@ -27,7 +27,7 @@ will be used.
 
 **Config keys**::
 
-    perserve_hostname: <true/false>
+    preserve_hostname: <true/false>
     fqdn: <fqdn>
     hostname: <fqdn/hostname>
 """
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index c5f84b1..c03f102 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -200,7 +200,7 @@ ssh_import_id: [smoser]
 #
 # Default: none
 # 
-debconf_selections: |     # Need to perserve newlines
+debconf_selections: |     # Need to preserve newlines
         # Force debconf priority to critical.
         debconf debconf/priority select critical