From 11c368531a85f5de0f17f0b80794645c5c9d121b Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 3 May 2016 16:14:31 +0100
Subject: [PATCH 1/2] Add --log-level to weave usage message, and document it
 and a couple of other options on the proxy.

---
 site/weave-docker-api/using-proxy.md | 7 +++++++
 weave                                | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md
index 3d578bb7..17d66be9 100644
--- a/site/weave-docker-api/using-proxy.md
+++ b/site/weave-docker-api/using-proxy.md
@@ -53,6 +53,13 @@ By default, multicast traffic is routed over the Weave network.
 To turn this off, for example, because you want to configure your own multicast
 route, add the `--no-multicast-route` flag to `weave launch-proxy`.
 
+###Other Weave Proxy options
+
+ * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md)
+ * `--log-level=debug|info|warning|error` -- controls how much
+   information to emit for debugging.
+ * `--no-restart` -- remove the default policy of `--restart=always`, if
+   you want to control start-up of the proxy yourself.
 
 **See Also**
 
diff --git a/weave b/weave
index 53ca7ec0..3662412f 100755
--- a/weave
+++ b/weave
@@ -41,17 +41,20 @@ weave --help | help
 
 weave launch        <same arguments as 'weave launch-router'>
       launch-router [--password <pass>] [--name <mac>] [--nickname <nickname>]
+                      [--log-level=debug|info|warning|error]
                       [--no-restart] [--ipalloc-init <mode>]
                       [--ipalloc-range <cidr> [--ipalloc-default-subnet <cidr>]]
                       [--no-discovery] [--no-dns]
                       [--trusted-subnets <cidr>,...] <peer> ...
       launch-proxy  [-H <endpoint>] [--without-dns] [--no-multicast-route]
+                      [--log-level=debug|info|warning|error]
                       [--no-rewrite-hosts] [--no-default-ipalloc] [--no-restart]
                       [--hostname-from-label <labelkey>]
                       [--hostname-match <regexp>]
                       [--hostname-replacement <replacement>]
                       [--rewrite-inspect]
       launch-plugin [--no-restart] [--no-multicast-route]
+                      [--log-level=debug|info|warning|error]
 
 weave prime
 

From 12fa345d109ab3f4c5358976c99e2710360ef32a Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 6 May 2016 11:10:34 +0100
Subject: [PATCH 2/2] Punctuation

---
 site/weave-docker-api/using-proxy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md
index 17d66be9..cbccc57e 100644
--- a/site/weave-docker-api/using-proxy.md
+++ b/site/weave-docker-api/using-proxy.md
@@ -57,9 +57,9 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`.
 
  * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md)
  * `--log-level=debug|info|warning|error` -- controls how much
-   information to emit for debugging.
+   information to emit for debugging
  * `--no-restart` -- remove the default policy of `--restart=always`, if
-   you want to control start-up of the proxy yourself.
+   you want to control start-up of the proxy yourself
 
 **See Also**