merge from master at 0.7.9-233-ge586fe35

2 files changed, 10 insertions, 10 deletions

diff --git a/doc/examples/cloud-config-chef.txt b/doc/examples/cloud-config-chef.txt
index 3cb62006..9d235817 100644
--- a/doc/examples/cloud-config-chef.txt
+++ b/doc/examples/cloud-config-chef.txt
@@ -1,6 +1,6 @@
 #cloud-config
 #
-# This is an example file to automatically install chef-client and run a 
+# This is an example file to automatically install chef-client and run a
 # list of recipes when the instance boots for the first time.
 # Make sure that this file is valid yaml before starting instances.
 # It should be passed as user-data when starting the instance.
@@ -8,7 +8,7 @@
 # This example assumes the instance is 16.04 (xenial)
 
 
-# The default is to install from packages. 
+# The default is to install from packages.
 
 # Key from https://packages.chef.io/chef.asc
 apt:
@@ -60,7 +60,7 @@ chef:
  force_install: false
 
  # Chef settings
- server_url: "https://chef.yourorg.com:4000"
+ server_url: "https://chef.yourorg.com"
 
  # Node Name
  # Defaults to the instance-id if not present
@@ -78,8 +78,8 @@ chef:
      -----BEGIN RSA PRIVATE KEY-----
      YOUR-ORGS-VALIDATION-KEY-HERE
      -----END RSA PRIVATE KEY-----
- 
- # A run list for a first boot json
+
+ # A run list for a first boot json, an example (not required)
  run_list:
   - "recipe[apache2]"
   - "role[db]"
@@ -92,7 +92,7 @@ chef:
       keepalive: "off"
 
  # if install_type is 'omnibus', change the url to download
- omnibus_url: "https://www.opscode.com/chef/install.sh"
+ omnibus_url: "https://www.chef.io/chef/install.sh"
 
 
 # Capture all subprocess output into a logfile
diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt
index 38ad0528..dd91477d 100644
--- a/doc/examples/cloud-config-disk-setup.txt
+++ b/doc/examples/cloud-config-disk-setup.txt
@@ -98,11 +98,11 @@ disk_setup:
 #
 #    table_type=<TYPE>: Currently the following are supported:
 #                    'mbr': default and setups a MS-DOS partition table
+#                    'gpt': setups a GPT partition table
 #
-#                Note: At this time only 'mbr' partition tables are allowed.
-#                    It is anticipated in the future that we'll have GPT as
-#                    option in the future, or even "RAID" to create a mdadm
-#                    RAID.
+#                Note: At this time only 'mbr' and 'gpt' partition tables
+#                    are allowed. It is anticipated in the future that
+#                    we'll also have "RAID" to create a mdadm RAID.
 #
 #    layout={...}: The device layout. This is a list of values, with the
 #                percentage of disk that partition will take.