merge from 0.7.9 at 0.7.9

5 files changed, 12 insertions, 12 deletions

diff --git a/doc/examples/cloud-config-apt.txt b/doc/examples/cloud-config-apt.txt
index 1a0fc6f2..ff8206f6 100644
--- a/doc/examples/cloud-config-apt.txt
+++ b/doc/examples/cloud-config-apt.txt
@@ -70,7 +70,7 @@ apt:
   # modifications have been made.
   # Suites are even disabled if no other modification was made,
   # but not if is preserve_sources_list is active.
-  # There is a special alias “$RELEASE” as in the sources that will be replace
+  # There is a special alias "$RELEASE" as in the sources that will be replace
   # by the matching release.
   #
   # To ease configuration and improve readability the following common ubuntu
@@ -84,7 +84,7 @@ apt:
   # There is no harm in specifying a suite to be disabled that is not found in
   # the source.list file (just a no-op then)
   #
-  # Note: Lines don’t get deleted, but disabled by being converted to a comment.
+  # Note: Lines don't get deleted, but disabled by being converted to a comment.
   # The following example disables all usual defaults except $RELEASE-security.
   # On top it disables a custom suite called "mysuite"
   disable_suites: [$RELEASE-updates, backports, $RELEASE, mysuite]
diff --git a/doc/examples/cloud-config-boot-cmds.txt b/doc/examples/cloud-config-boot-cmds.txt
index 5c05bef7..84e487a5 100644
--- a/doc/examples/cloud-config-boot-cmds.txt
+++ b/doc/examples/cloud-config-boot-cmds.txt
@@ -9,7 +9,7 @@
 # boothook, but possibly with more friendly.
 # - bootcmd will run on every boot
 # - the INSTANCE_ID variable will be set to the current instance id.
-# - you can use 'cloud-init-boot-per' command to help only run once
+# - you can use 'cloud-init-per' command to help only run once
 bootcmd:
  - echo 192.168.1.130 us.archive.ubuntu.com >> /etc/hosts
  - [ cloud-init-per, once, mymkfs, mkfs, /dev/vdb ]
diff --git a/doc/examples/cloud-config-gluster.txt b/doc/examples/cloud-config-gluster.txt
index f8183e77..cb979123 100644
--- a/doc/examples/cloud-config-gluster.txt
+++ b/doc/examples/cloud-config-gluster.txt
@@ -1,6 +1,6 @@
 #cloud-config
 # vim: syntax=yaml
-# Mounts volfile exported by glusterfsd running on 
+# Mounts volfile exported by glusterfsd running on
 # "volfile-server-hostname" onto the local mount point '/mnt/data'
 #
 # In reality, replace 'volfile-server-hostname' with one of your nodes
@@ -10,7 +10,7 @@ packages:
  - glusterfs-client
 
 mounts:
- - [ 'volfile-server-hostname:6996', /mnt/data, glusterfs, "defaults,nobootwait", "0", "2" ]
+ - [ 'volfile-server-hostname:6996', /mnt/data, glusterfs, "defaults,nofail", "0", "2" ]
 
 runcmd:
  - [ modprobe, fuse ]
diff --git a/doc/examples/cloud-config-mount-points.txt b/doc/examples/cloud-config-mount-points.txt
index aa676c24..5a6c24f5 100644
--- a/doc/examples/cloud-config-mount-points.txt
+++ b/doc/examples/cloud-config-mount-points.txt
@@ -23,19 +23,19 @@
 # - if an entry does not have all 6 fields, they will be filled in
 #   with values from 'mount_default_fields' below.
 #
-# Note, that you should set 'nobootwait' (see man fstab) for volumes that may
-# not be attached at instance boot (or reboot)
+# Note, that you should set 'nofail' (see man fstab) for volumes that may not
+# be attached at instance boot (or reboot).
 #
 mounts:
  - [ ephemeral0, /mnt, auto, "defaults,noexec" ]
  - [ sdc, /opt/data ]
- - [ xvdh, /opt/data, "auto", "defaults,nobootwait", "0", "0" ]
+ - [ xvdh, /opt/data, "auto", "defaults,nofail", "0", "0" ]
  - [ dd, /dev/zero ]
 
 # mount_default_fields
 # These values are used to fill in any entries in 'mounts' that are not
 # complete.  This must be an array, and must have 7 fields.
-mount_default_fields: [ None, None, "auto", "defaults,nobootwait", "0", "2" ]
+mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ]
 
 
 # swap can also be set up by the 'mounts' module
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index 190029e4..c5f84b13 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -46,19 +46,19 @@ packages:
 # - if an entry does not have all 6 fields, they will be filled in
 #   with values from 'mount_default_fields' below.
 #
-# Note, that you should set 'nobootwait' (see man fstab) for volumes that may
+# Note, that you should set 'nofail' (see man fstab) for volumes that may
 # not be attached at instance boot (or reboot)
 #
 mounts:
  - [ ephemeral0, /mnt, auto, "defaults,noexec" ]
  - [ sdc, /opt/data ]
- - [ xvdh, /opt/data, "auto", "defaults,nobootwait", "0", "0" ]
+ - [ xvdh, /opt/data, "auto", "defaults,nofail", "0", "0" ]
  - [ dd, /dev/zero ]
 
 # mount_default_fields
 # These values are used to fill in any entries in 'mounts' that are not
 # complete.  This must be an array, and must have 7 fields.
-mount_default_fields: [ None, None, "auto", "defaults,nobootwait", "0", "2" ]
+mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ]
 
 # add each entry to ~/.ssh/authorized_keys for the configured user or the
 # first user defined in the user definition directive.