Merge branch 'master' of https://github.com/docker/docker.github.io

johndmulhausen · johndmulhausen · commit d2cc9fe88586 · 2016-10-04T15:38:45.000-07:00
diff --git a/engine/installation/linux/rhel.md b/engine/installation/linux/rhel.md
@@ -44,15 +44,15 @@ which also installs via the `yum` package manager.
 
 ### Install with yum
 
-1. Log into your machine as a user with `sudo` or `root` privileges.
+1.  Log into your machine as a user with `sudo` or `root` privileges.
 
-2. Make sure your existing packages are up-to-date.
+2.  Make sure your existing packages are up-to-date.
 
     ```bash
     $ sudo yum update
     ```
 
-3. Add the `yum` repo.
+3.  Add the `yum` repo.
 
     ```bash
     $ sudo tee /etc/yum.repos.d/docker.repo <<-'EOF'
@@ -65,19 +65,19 @@ which also installs via the `yum` package manager.
     EOF
     ```
 
-4. Install the Docker package.
+4.  Install the Docker package.
 
     ```bash
     $ sudo yum install docker-engine
     ```
 
-5. Enable the service.
+5.  Enable the service.
 
     ```bash
     $ sudo systemctl enable docker.service
     ```
 
-6. Start the Docker daemon.
+6.  Start the Docker daemon.
 
     ```bash
     $ sudo systemctl start docker
@@ -119,35 +119,35 @@ learn how to [customize your Systemd Docker daemon options](../../admin/systemd.
 
 ### Install with the script
 
-1. Log into your machine as a user with `sudo` or `root` privileges.
+1.  Log into your machine as a user with `sudo` or `root` privileges.
 
-2. Make sure your existing packages are up-to-date.
+2.  Make sure your existing packages are up-to-date.
 
     ```bash
     $ sudo yum update
     ```
 
-3. Run the Docker installation script.
+3.  Run the Docker installation script.
 
     ```bash
     $ curl -fsSL https://get.docker.com/ | sh
     ```
 
     This script adds the `docker.repo` repository and installs Docker.
 
-4. Enable the service.
+4.  Enable the service.
 
     ```bash
     $ sudo systemctl enable docker.service
     ```
 
-5. Start the Docker daemon.
+5.  Start the Docker daemon.
 
     ```bash
     $ sudo systemctl start docker
     ```
 
-6. Verify `docker` is installed correctly by running a test image in a container.
+6.  Verify `docker` is installed correctly by running a test image in a container.
 
     ```bash
     $ sudo docker run hello-world
@@ -173,25 +173,25 @@ makes the ownership of the Unix socket read/writable by the `docker` group.
 
 To create the `docker` group and add your user:
 
-1. Log into your machine as a user with `sudo` or `root` privileges.
+1.  Log into your machine as a user with `sudo` or `root` privileges.
 
-2. Create the `docker` group.
+2.  Create the `docker` group.
 
     ```bash
     $ sudo groupadd docker
     ```
 
-3. Add your user to `docker` group.
+3.  Add your user to `docker` group.
 
     ```bash
     $ sudo usermod -aG docker your_username`
     ```
 
-4. Log out and log back in.
+4.  Log out and log back in.
 
     This ensures your user is running with the correct permissions.
 
-5. Verify that your user is in the docker group by running `docker` without `sudo`.
+5.  Verify that your user is in the docker group by running `docker` without `sudo`.
 
     ```bash
     $ docker run hello-world
@@ -209,15 +209,15 @@ $ sudo systemctl enable docker
 
 You can uninstall the Docker software with `yum`.
 
-1. List the installed Docker packages.
+1.  List the installed Docker packages.
 
     ```bash
     $ yum list installed | grep docker
 
     docker-engine.x86_64     1.7.1-0.1.el7@/docker-engine-1.7.1-0.1.el7.x86_64
     ```
 
-2. Remove the package.
+2.  Remove the package.
 
     ```bash
     $ sudo yum -y remove docker-engine.x86_64
@@ -226,7 +226,7 @@ You can uninstall the Docker software with `yum`.
 	This command does not remove images, containers, volumes, or user-created
 	configuration files on your host.
 
-3. To delete all images, containers, and volumes, run the following command:
+3.  To delete all images, containers, and volumes, run the following command:
 
     ```bash
     $ rm -rf /var/lib/docker
diff --git a/engine/installation/linux/ubuntulinux.md b/engine/installation/linux/ubuntulinux.md
@@ -16,7 +16,6 @@ title: 'Installation on Ubuntu '
 Docker is supported on these Ubuntu operating systems:
 
 - Ubuntu Xenial 16.04 (LTS)
-- Ubuntu Wily 15.10
 - Ubuntu Trusty 14.04 (LTS)
 - Ubuntu Precise 12.04 (LTS)
 
@@ -83,10 +82,6 @@ packages from the new repository:
 
             deb https://apt.dockerproject.org/repo ubuntu-trusty main
 
-    - Ubuntu Wily 15.10
-
-            deb https://apt.dockerproject.org/repo ubuntu-wily main
-
     - Ubuntu Xenial 16.04 (LTS)
 
             deb https://apt.dockerproject.org/repo ubuntu-xenial main
@@ -116,10 +111,9 @@ packages from the new repository:
 ### Prerequisites by Ubuntu Version
 
 - Ubuntu Xenial 16.04 (LTS)
-- Ubuntu Wily 15.10
 - Ubuntu Trusty 14.04 (LTS)
 
-For Ubuntu Trusty, Wily, and Xenial, it's recommended to install the
+For Ubuntu Trusty, and Xenial, it's recommended to install the
 `linux-image-extra-*` kernel packages. The `linux-image-extra-*` packages
 allows you use the `aufs` storage driver.
 
diff --git a/machine/drivers/aws.md b/machine/drivers/aws.md
@@ -72,6 +72,7 @@ You can use environment variables:
 -   `--amazonec2-use-ebs-optimized-instance`: Create an EBS Optimized Instance, instance type must support it.
 -   `--amazonec2-ssh-keypath`: Path to Private Key file to use for instance. Matching public key with .pub extension should exist
 -   `--amazonec2-retries`:  Set retry count for recoverable failures (use -1 to disable)
+-   `--amazonec2-userdata`: Path to custom User Data file.
 
 
 #### Environment variables and default values:
@@ -102,6 +103,7 @@ You can use environment variables:
 | `--amazonec2-use-ebs-optimized-instance` | -                       | `false`          |
 | `--amazonec2-ssh-keypath`                | `AWS_SSH_KEYPATH`       | -                |
 | `--amazonec2-retries`                    | -                       | `5`              |
+| `--amazonec2-user-data`                  | `AWS_USERDATA`          | -                |
 
 ## Default AMIs
 
