README.md in kitchen-ec2-0.9.5 vs README.md in kitchen-ec2-0.10.0.rc.0

@@ -19,13 +19,18 @@
 Please read the [Driver usage][driver_usage] page for more details.
 
 ## Default Configuration
 
 This driver can determine AMI and username login for a select number of
-platforms in each region. Currently, the following platform names are
-supported:
+platforms in each region.
 
+For Windows instances the generated Administrator password is fetched
+automatically from Amazon EC2 with the same private key as we use for
+SSH logins to Linux.
+
+Currently, the following platform names are supported:
+
 ```ruby
 ---
 platforms:
   - name: ubuntu-10.04
   - name: ubuntu-12.04
@@ -33,31 +38,37 @@
   - name: ubuntu-13.04
   - name: ubuntu-13.10
   - name: ubuntu-14.04
   - name: centos-6.4
   - name: debian-7.1.0
+  - name: windows-2012r2
+  - name: windows-2008r2
 ```
 
 This will effectively generate a configuration similar to:
 
 ```ruby
 ---
 platforms:
   - name: ubuntu-10.04
     driver:
       image_id: ami-1ab3ce73
+    transport:
       username: ubuntu
-  - name: ubuntu-12.04
-    driver:
-      image_id: ami-2f115c46
-      username: ubuntu
   # ...
   - name: centos-6.4
     driver:
       image_id: ami-bf5021d6
+    transport:
       username: root
   # ...
+  - name: windows-2012r2
+    driver:
+      image_id: ami-28bc7428
+    transport:
+      username: administrator
+  # ...
 ```
 
 For specific default values, please consult [amis.json][amis_json].
 
 ## Authenticating with AWS
@@ -176,19 +187,23 @@
 
 The Hash of EC tag name/value pairs which will be applied to the instance.
 
 The default is `{ "created-by" => "test-kitchen" }`.
 
-### user_data
+### user\_data
 
 The user_data script or the path to a script to feed the instance.
 Use bash to install dependencies or download artifacts before chef runs.
 This is just for some cases. If you can do the stuff with chef, then do it with
 chef!
 
-The default is unset, or `nil`.
+On linux instances the default is unset, or `nil`.
 
+On Windows instances we specify a default that enables winrm and
+adds a non-administrator user specified in the `username` transport
+options to the Administrator's User Group.
+
 ### iam\_profile\_name
 
 The EC2 IAM profile name to use.
 
 The default is `nil`.
@@ -230,14 +245,14 @@
 ### <a name="config-block_device_mappings"></a> block\_device\_mappings
 
 A list of block device mappings for the machine.  An example of all available keys looks like:
 ```yaml
 block_device_mappings:
-  - ebs_device_name: /dev/sda1
+  - ebs_device_name: /dev/sda
     ebs_volume_size: 20
     ebs_delete_on_termination: true
-  - ebs_device_name: /dev/sda2
+  - ebs_device_name: /dev/sdb
     ebs_volume_type: gp2
     ebs_virtual_name: test
     ebs_volume_size: 15
     ebs_delete_on_termination: true
     ebs_snapshot_id: snap-0015d0bc
@@ -359,40 +374,49 @@
 ---
 driver:
   name: ec2
   aws_ssh_key_id: id_rsa-aws
   security_group_ids: ["sg-1a2b3c4d"]
-  region: us-east-1
+  region: us-west-2
   availability_zone: b
   require_chef_omnibus: true
-  subnet_id: subnet-6d6...
+  subnet_id: subnet-6e5d4c3b
   iam_profile_name: chef-client
-  instance_type: t2.micro
+  instance_type: m3.medium
   associate_public_ip: true
-  private_ip_address: 10.0.0.27
   interface: dns
-  block_device_mappings:
-    - ebs_device_name: /dev/sda0
-      ebs_volume_type: gp2
-      ebs_virtual_name: test
-      ebs_volume_size: 15
-      ebs_delete_on_termination: true
 
 transport:
   ssh_key: /path/to/id_rsa-aws
   connection_timeout: 10
   connection_retries: 5
   username: ubuntu
 
 platforms:
   - name: ubuntu-12.04
+  - name: centos-6.4
+  - name: ubuntu-15.04
     driver:
-      image_id: ami-fd20ad94
-      username: ubuntu
-  - name: centos-6.3
+      image_id: ami-83211eb3
+      block_device_mappings:
+        - ebs_device_name: /dev/sda1
+          ebs_volume_type: standard
+          ebs_virtual_name: test
+          ebs_volume_size: 15
+          ebs_delete_on_termination: true
+  - name: centos-7
     driver:
-      image_id: ami-ef5ff086
-      username: ec2-user
+      image_id: ami-c7d092f7
+      block_device_mappings:
+        - ebs_device_name: /dev/sdb
+          ebs_volume_type: gp2
+          ebs_virtual_name: test
+          ebs_volume_size: 8
+          ebs_delete_on_termination: true
+    transport:
+      username: centos
+  - name: windows-2012r2
+  - name: windows-2008r2
 
 suites:
 # ...
 ```