From 6197f98c260d74ca7244ca02ae2511deb067f925 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sun, 24 May 2015 16:27:34 +0100
Subject: [PATCH] reword proxy intro a bit

---
 site/features.md | 12 ++++++------
 site/proxy.md    | 16 ++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/site/features.md b/site/features.md
index dfee4b13..f1c500eb 100644
--- a/site/features.md
+++ b/site/features.md
@@ -24,7 +24,7 @@ example](https://github.com/weaveworks/weave#example):
  * [Fault tolerance](#fault-tolerance)
  * [Automatic IP address management](#ipam)
  * [Automatic discovery with WeaveDNS](#dns)
- * [Proxy](#proxy)
+ * [Starting containers with Docker](#proxy)
 
 ### <a name="virtual-ethernet-switch"></a>Virtual Ethernet Switch
 
@@ -406,9 +406,9 @@ WeaveDNS is a distributed DNS service for weave networks, enabling
 containers to address each other by name rather than IP address. Find
 out more about WeaveDNS from its [documentation](weavedns.html).
 
-### <a name="proxy"></a>Proxy
+### <a name="proxy"></a>Starting containers with Docker
 
-The weave proxy enables you to use the docker command-line utility, allowing
-weave-enabled containers to be started in the foreground, and to wait for the
-weave network interface before running. Find out more about the weave proxy
-from its [documentation](proxy.html).
+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 8011a209..1e9ea6ce 100644
--- a/site/proxy.md
+++ b/site/proxy.md
@@ -3,13 +3,17 @@ title: Weave Proxy
 layout: default
 ---
 
-# <a name="weave-proxy"></a>Weave Proxy
+# Proxy
 
-Instead of the weave command-line utility, you may prefer to use the
-standard docker command-line utility to manage containers. This will
-allow containers to be started in foreground mode. It will also ensure
-that the weave network interface is available before running your
-container.
+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.
+
+Using the proxy brings some additional benefits over `weave run`. The
+proxy ensures that the weave network interface is available before
+starting a container's application process. Furthermore, containers
+can be started in foreground mode, and can be automatically removed
+(with the ususal `--rm`).
 
 ## Setup