Matching PR docker#3753 @ Machine

A PR slipped in post-migration at https://github.com/docker/machine/pull/3753/files

Author: johndmulhausen

machine/drivers/exoscale.md

@@ -10,32 +10,31 @@ title: exoscale
 
 # Exoscale
 
-Create machines on [exoscale](https://www.exoscale.ch/).
+Create machines on [Exoscale](https://www.exoscale.ch/).
 
 Get your API key and API secret key from [API details](https://portal.exoscale.ch/account/api) and pass them to `machine create` with the `--exoscale-api-key` and `--exoscale-api-secret-key` options.
 
-## Usage
-
     $ docker-machine create --driver exoscale --exoscale-api-key=API --exoscale-api-secret-key=SECRET vm
 
-## Options
+Options:
 
 -   `--exoscale-url`: Your API endpoint.
 -   `--exoscale-api-key`: **required** Your API key.
 -   `--exoscale-api-secret-key`: **required** Your API secret key.
 -   `--exoscale-instance-profile`: Instance profile.
 -   `--exoscale-disk-size`: Disk size for the host in GB (10, 50, 100, 200, 400).
--   `--exoscale-image`: Image template (eg. ubuntu-14.04, ubuntu-15.10).
+-   `--exoscale-image`: Image template (e.g. ubuntu-16.04, ubuntu-15.10).
 -   `--exoscale-security-group`: Security group. It will be created if it doesn't exist.
 -   `--exoscale-availability-zone`: Exoscale availability zone.
 -   `--exoscale-ssh-user`: SSH username, which must match the default SSH user for the used image.
 -   `--exoscale-userdata`: Path to file containing user data for cloud-init.
+-   `--exoscale-affinity-group`: Affinity group the machine will be started in.
 
 If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule. Moreover, if you want to use Swarm, also add TCP port 3376.
 
 There is a limit to the number of docker machines that an anti-affinity group can have.  This can be worked around by specifying an additional anti-affinity group using `--exoscale-affinity-group=docker-machineX`
 
-#### Environment variables and default values
+Environment variables and default values:
 
 | CLI option                      | Environment variable         | Default                           |
 | ------------------------------- | ---------------------------- | --------------------------------- |
@@ -44,8 +43,9 @@ There is a limit to the number of docker machines that an anti-affinity group ca
 | **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET`        | -                                 |
 | `--exoscale-instance-profile`   | `EXOSCALE_INSTANCE_PROFILE`  | `small`                           |
 | `--exoscale-disk-size`          | `EXOSCALE_DISK_SIZE`         | `50`                              |
-| `--exoscale-image`              | `EXOSCALE_IMAGE`             | `ubuntu-15.10`                    |
+| `--exoscale-image`              | `EXOSCALE_IMAGE`             | `ubuntu-16.04`                    |
 | `--exoscale-security-group`     | `EXOSCALE_SECURITY_GROUP`    | `docker-machine`                  |
-| `--exoscale-availability-zone`  | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2`                        |
+| `--exoscale-availability-zone`  | `EXOSCALE_AVAILABILITY_ZONE` | `ch-dk-2`                         |
 | `--exoscale-ssh-user`           | `EXOSCALE_SSH_USER`          | `ubuntu`                          |
 | `--exoscale-userdata`           | `EXOSCALE_USERDATA`          | -                                 |
+| `--exoscale-affinity-group`     | `EXOSCALE_AFFINITY_GROUP`    | `docker-machine`                  |