From aafc1a56f98ef27db911048df072da1f9e6cd5d3 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 26 May 2015 11:40:39 +0100 Subject: [PATCH] Reword weave proxy intro --- site/features.md | 2 +- site/proxy.md | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/site/features.md b/site/features.md index f1c500eb..9645d19e 100644 --- a/site/features.md +++ b/site/features.md @@ -408,7 +408,7 @@ out more about WeaveDNS from its [documentation](weavedns.html). ### Starting containers with Docker -Instead of the weave command-line utility, you may prefer to use the +Instead of the `weave` command-line utility, you may prefer to use the standard Docker command-line interface, or the Docker remote API, for starting weave-enabled containers. This can be accomplished with the [Weave Proxy](proxy.html). diff --git a/site/proxy.md b/site/proxy.md index 1e9ea6ce..a63cecaa 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -5,9 +5,11 @@ layout: default # Proxy -The weave proxy automatically attaches containers to the weave network -that have been started using the ordinary Docker command-line -interface or Docker remote API. +Instead of the `weave` command-line utility, you may prefer to use the +standard Docker command-line interface, or the Docker remote API. The +weave proxy sits between the `docker` command or API and the Docker +daemon, so that it can automatically attach containers to the weave +network. Using the proxy brings some additional benefits over `weave run`. The proxy ensures that the weave network interface is available before @@ -17,8 +19,7 @@ can be started in foreground mode, and can be automatically removed ## Setup -To do this, while still connecting containers to the weave network, -you can use the weave proxy. We can start the proxy with +Start the proxy with host1$ weave launch-proxy