From 4a7d4d355540711999674599a880da48427f01d1 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Tue, 9 Jun 2015 14:41:17 +0100
Subject: [PATCH] [proxy] documenting -L option

---
 site/proxy.md | 12 ++++++++----
 weave         |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/site/proxy.md b/site/proxy.md
index 1dc35801..58030ad1 100644
--- a/site/proxy.md
+++ b/site/proxy.md
@@ -35,9 +35,13 @@ argument, e.g.
 
     host1$ weave launch-proxy -H tcp://127.0.0.1:4243
 
-The proxy listens on port 12375, on all network interfaces. All docker
-commands can be run via the proxy, so it is safe to globally adjust
-your `DOCKER_HOST` to point at the proxy, e.g.
+By default, the proxy listens on port 12375, on all network
+interfaces. This can be adjusted with the `-L` argument, e.g.
+
+    host1$ weave launch-proxy -L 127.0.0.1:9999
+
+All docker commands can be run via the proxy, so it is safe to
+globally adjust your `DOCKER_HOST` to point at the proxy, e.g.
 
     host1$ export DOCKER_HOST=tcp://localhost:12375
     host1$ docker ps
@@ -46,7 +50,7 @@ your `DOCKER_HOST` to point at the proxy, e.g.
 If you are working with a remote docker daemon, then `localhost` in
 the above needs to be replaced with the docker daemon host, and any
 firewalls inbetween need to be configured to permit access to
-port 12375.
+the proxy port.
 
 ## <a name="usage"></a>Usage
 
diff --git a/weave b/weave
index 26f631cb..fff7c35b 100755
--- a/weave
+++ b/weave
@@ -28,7 +28,7 @@ usage() {
     echo "weave launch       [-password <password>] [-nickname <nickname>] [-nodiscovery]"
     echo "                       [-iprange <cidr>] <peer> ..."
     echo "weave launch-dns   <cidr>"
-    echo "weave launch-proxy [-H <docker_endpoint>] [--with-dns] [--with-ipam]"
+    echo "weave launch-proxy [-H <docker_endpoint>] [-L <address>] [--with-dns] [--with-ipam]"
     echo "weave connect      [--replace] [<peer> ...]"
     echo "weave forget       <peer> ..."
     echo "weave run          [--with-dns] [<cidr> ...] <docker run args> ..."
@@ -51,6 +51,7 @@ usage() {
     echo "where <peer>    = <ip_address_or_fqdn>[:<port>]"
     echo "      <cidr>    = <ip_address>/<routing_prefix_length>"
     echo "      <peer_id> = <nickname> or weave internal peer ID"
+    echo "      <address> = [<ip_address>]:<port>"
     exit 1
 }