diff --git a/docs/django.md b/docs/django.md
index c8863b345..fb1fa2141 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -10,10 +10,9 @@ weight=4
 <![end-metadata]-->
 
 
-# Quickstart: Compose and Django
+# Quickstart: Docker Compose and Django
 
-This quick-start guide demonstrates how to use Compose to set up and run a
-simple Django/PostgreSQL app. Before starting, you'll need to have
+This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting, you'll need to have
 [Compose installed](install.md).
 
 ## Define the project components
diff --git a/docs/gettingstarted.md b/docs/gettingstarted.md
index 36577f075..60482bce5 100644
--- a/docs/gettingstarted.md
+++ b/docs/gettingstarted.md
@@ -12,7 +12,7 @@ weight=-85
 
 # Getting Started
 
-On this page you build a simple Python web application running on Compose. The
+On this page you build a simple Python web application running on Docker Compose. The
 application uses the Flask framework and increments a value in Redis. While the
 sample uses Python, the concepts demonstrated here should be understandable even
 if you're not familiar with it.
diff --git a/docs/images/django-it-worked.png b/docs/images/django-it-worked.png
index 2e8266279..75769754b 100644
Binary files a/docs/images/django-it-worked.png and b/docs/images/django-it-worked.png differ
diff --git a/docs/images/rails-welcome.png b/docs/images/rails-welcome.png
index 8d250f84b..51512dbda 100644
Binary files a/docs/images/rails-welcome.png and b/docs/images/rails-welcome.png differ
diff --git a/docs/images/wordpress-files.png b/docs/images/wordpress-files.png
new file mode 100644
index 000000000..4762935ba
Binary files /dev/null and b/docs/images/wordpress-files.png differ
diff --git a/docs/images/wordpress-lang.png b/docs/images/wordpress-lang.png
new file mode 100644
index 000000000..f0bd864ef
Binary files /dev/null and b/docs/images/wordpress-lang.png differ
diff --git a/docs/images/wordpress-welcome.png b/docs/images/wordpress-welcome.png
new file mode 100644
index 000000000..c9ba20368
Binary files /dev/null and b/docs/images/wordpress-welcome.png differ
diff --git a/docs/rails.md b/docs/rails.md
index ccb0ab73f..a8fc383e7 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -9,9 +9,9 @@ weight=5
 +++
 <![end-metadata]-->
 
-## Quickstart: Compose and Rails
+## Quickstart: Docker Compose and Rails
 
-This Quickstart guide will show you how to use Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
+This Quickstart guide will show you how to use Docker Compose to set up and run a Rails/PostgreSQL app. Before starting, you'll need to have [Compose installed](install.md).
 
 ### Define the project
 
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 62aec2518..62f50c249 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -10,88 +10,133 @@ weight=6
 <![end-metadata]-->
 
 
-# Quickstart: Compose and WordPress
+# Quickstart: Docker Compose and WordPress
 
-You can use Compose to easily run WordPress in an isolated environment built
-with Docker containers.
+You can use Docker Compose to easily run WordPress in an isolated environment built
+with Docker containers. This quick-start guide demonstrates how to use Compose to set up and run WordPress. Before starting, you'll need to have
+[Compose installed](install.md).
 
 ## Define the project
 
-First, [Install Compose](install.md) and then download WordPress into the
-current directory:
+1. Create an empty project directory.
 
-    $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
+    You can name the directory something easy for you to remember. This directory is the context for your application image. The directory should only contain resources to build that image.
 
-This will create a directory called `wordpress`. If you wish, you can rename it
-to the name of your project.
+    This project directory will contain a `Dockerfile`, a `docker-compose.yaml` file, along with a downloaded `wordpress` directory and a custom `wp-config.php`, all of which you will create in the following steps.
 
-Next, inside that directory, create a `Dockerfile`, a file that defines what
-environment your app is going to run in. For more information on how to write
-Dockerfiles, see the
-[Docker user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the
-[Dockerfile reference](https://docs.docker.com/engine/reference/builder/). In
-this case, your Dockerfile should be:
+2. Change directories into your project directory.
 
-    FROM orchardup/php5
-    ADD . /code
+    For example, if you named your directory `my_wordpress`:
 
-This tells Docker how to build an image defining a container that contains PHP
-and WordPress.
+        $ cd my-wordpress/
 
-Next you'll create a `docker-compose.yml` file that will start your web service
-and a separate MySQL instance:
+3. Create a `Dockerfile`, a file that defines the environment in which your application will run.
 
-    version: '2'
-    services:
-      web:
-        build: .
-        command: php -S 0.0.0.0:8000 -t /code
-        ports:
-          - "8000:8000"
-        depends_on:
-          - db
-        volumes:
-          - .:/code
-      db:
-        image: orchardup/mysql
-        environment:
-          MYSQL_DATABASE: wordpress
+    For more information on how to write Dockerfiles, see the [Docker Engine user guide](https://docs.docker.com/engine/userguide/dockerimages/#building-an-image-from-a-dockerfile) and the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
 
-A supporting file is needed to get this working. `wp-config.php` is
-the standard WordPress config file with a single change to point the database
-configuration at the `db` container:
+    In this case, your Dockerfile should include these two lines:
 
-    <?php
-    define('DB_NAME', 'wordpress');
-    define('DB_USER', 'root');
-    define('DB_PASSWORD', '');
-    define('DB_HOST', "db:3306");
-    define('DB_CHARSET', 'utf8');
-    define('DB_COLLATE', '');
+        FROM orchardup/php5
+        ADD . /code
 
-    define('AUTH_KEY',         'put your unique phrase here');
-    define('SECURE_AUTH_KEY',  'put your unique phrase here');
-    define('LOGGED_IN_KEY',    'put your unique phrase here');
-    define('NONCE_KEY',        'put your unique phrase here');
-    define('AUTH_SALT',        'put your unique phrase here');
-    define('SECURE_AUTH_SALT', 'put your unique phrase here');
-    define('LOGGED_IN_SALT',   'put your unique phrase here');
-    define('NONCE_SALT',       'put your unique phrase here');
+    This tells the Docker Engine daemon how to build an image defining a container that contains PHP and WordPress.
 
-    $table_prefix  = 'wp_';
-    define('WPLANG', '');
-    define('WP_DEBUG', false);
+4. Create a `docker-compose.yml` file that will start your web service and a separate MySQL instance:
 
-    if ( !defined('ABSPATH') )
-        define('ABSPATH', dirname(__FILE__) . '/');
+        version: '2'
+        services:
+          web:
+            build: .
+            command: php -S 0.0.0.0:8000 -t /code/wordpress/
+            ports:
+              - "8000:8000"
+            depends_on:
+              - db
+            volumes:
+              - .:/code
+          db:
+            image: orchardup/mysql
+            environment:
+              MYSQL_DATABASE: wordpress
 
-    require_once(ABSPATH . 'wp-settings.php');
+5. Download WordPress into the current directory:
+
+        $ curl https://wordpress.org/latest.tar.gz | tar -xvzf -
+
+    This creates a directory called `wordpress` in your project directory.
+
+6. Create a `wp-config.php` file within the `wordpress` directory.
+
+    A supporting file is needed to get this working. At the top level of the wordpress directory, add a new file called `wp-config.php` as shown. This is the standard WordPress config file with a single change to point the database configuration at the `db` container:
+
+        <?php
+        define('DB_NAME', 'wordpress');
+        define('DB_USER', 'root');
+        define('DB_PASSWORD', '');
+        define('DB_HOST', "db:3306");
+        define('DB_CHARSET', 'utf8');
+        define('DB_COLLATE', '');
+
+        define('AUTH_KEY',         'put your unique phrase here');
+        define('SECURE_AUTH_KEY',  'put your unique phrase here');
+        define('LOGGED_IN_KEY',    'put your unique phrase here');
+        define('NONCE_KEY',        'put your unique phrase here');
+        define('AUTH_SALT',        'put your unique phrase here');
+        define('SECURE_AUTH_SALT', 'put your unique phrase here');
+        define('LOGGED_IN_SALT',   'put your unique phrase here');
+        define('NONCE_SALT',       'put your unique phrase here');
+
+        $table_prefix  = 'wp_';
+        define('WPLANG', '');
+        define('WP_DEBUG', false);
+
+        if ( !defined('ABSPATH') )
+          define('ABSPATH', dirname(__FILE__) . '/');
+
+        require_once(ABSPATH . 'wp-settings.php');
+        ?>
+
+7. Verify the contents and structure of your project directory.
+<!--
+        Dockerfile
+        docker-compose.yaml
+        wordpress/
+          index.php
+          license.txt
+          readme.html
+          wp-activate.php
+          wp-admin/
+          wp-blog-header.php
+          wp-comments-post.php
+          wp-config-sample.php
+          wp-config.php
+          wp-content/
+          wp-cron.php
+          wp-includes/
+          wp-links-opml.php
+          wp-load.php
+          wp-login.php
+          wp-mail.php
+          wp-settings.php
+          wp-signup.php
+          wp-trackback.php
+          xmlrpc.php
+      -->
+
+    ![WordPress files](images/wordpress-files.png)
 
 ### Build the project
 
-With those four files in place, run `docker-compose up` inside your WordPress
-directory and it'll pull and build the needed images, and then start the web and
-database containers. If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
+With those four new files in place, run `docker-compose up` from your project directory. This will pull and build the needed images, and then start the web and database containers.
+
+If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
+
+At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
+
+![Choose language for WordPress install](images/wordpress-lang.png)
+
+![WordPress Welcome](images/wordpress-welcome.png)
+
 
 ## More Compose documentation