From c4d4069279c13ddecc80c18feb4742185b41dd77 Mon Sep 17 00:00:00 2001 From: Kevin Conboy Date: Tue, 15 Nov 2016 09:47:54 -0700 Subject: [PATCH 1/2] Update wordpress.md capital_P_dangit() --- compose/wordpress.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/wordpress.md b/compose/wordpress.md index ab057efb95..f49e3f5636 100644 --- a/compose/wordpress.md +++ b/compose/wordpress.md @@ -23,7 +23,7 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t cd my_wordpress/ 3. Create a `docker-compose.yml` file that will start your - `Wordpress` blog and a separate `MySQL` instance with a volume + `WordPress` blog and a separate `MySQL` instance with a volume mount for data persistence: ```none @@ -91,7 +91,7 @@ If you're using [Docker Machine](/machine/), then `docker-machine ip MACHINE_VM` 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. -**NOTE**: The Wordpress site will not be immediately available on port `8000` because the containers are still being initialized and may take a couple of minutes before the first load. +**NOTE**: The WordPress site will not be immediately available on port `8000` because the containers are still being initialized and may take a couple of minutes before the first load. ![Choose language for WordPress install](images/wordpress-lang.png) @@ -105,4 +105,4 @@ At this point, WordPress should be running on port `8000` of your Docker Host, a - [Get started with Django](django.md) - [Get started with Rails](rails.md) - [Command line reference](./reference/index.md) -- [Compose file reference](compose-file.md) \ No newline at end of file +- [Compose file reference](compose-file.md) From 645e5721461fa5e598035d91c6aefecc7ab409cd Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Thu, 17 Nov 2016 14:39:59 -0800 Subject: [PATCH 2/2] Add swarm routing mesh topic to TOC Signed-off-by: Misty Stanley-Jones --- _data/toc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/toc.yaml b/_data/toc.yaml index 17851adc14..d62de81dee 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -205,6 +205,8 @@ toc: title: Apply rolling updates - path: /engine/swarm/swarm-tutorial/drain-node/ title: Drain a node + - path: /engine/swarm/ingress/ + title: Use swarm mode routing mesh - sectiontitle: How swarm mode works section: - path: /engine/swarm/how-swarm-mode-works/nodes/