From daf92d8e081bbf43e46b0a2a16ace03649dd7659 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 28 Mar 2016 12:46:58 +0100
Subject: [PATCH 1/2] document `--no-dns`

Part of #1687.
---
 site/weavedns.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/weavedns.md b/site/weavedns.md
index 12a5fe48..2c950c61 100644
--- a/site/weavedns.md
+++ b/site/weavedns.md
@@ -55,7 +55,8 @@ root@ubuntu:/# ping pingme
 > be registered, but will still use weaveDNS for resolution.
 
 To disable application containers' use of weaveDNS, add the
-`--without-dns` option to `weave run` or `weave launch-proxy`.
+`--without-dns` option to `weave run` or `weave launch-proxy`. To
+disable weaveDNS itself, launch weave with the `--no-dns` option.
 
 ## <a name="how-it-works"></a>How it works
 

From a1381fe0cfbb75b8bde90919af497f455090607e Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 28 Mar 2016 12:49:31 +0100
Subject: [PATCH 2/2] add `--no-dns` to usage

Closes #1687.
---
 weave | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weave b/weave
index 52106fd0..36502741 100755
--- a/weave
+++ b/weave
@@ -43,7 +43,7 @@ weave version
 weave launch        <same arguments as 'weave launch-router'>
 weave launch-router [--password <password>] [--nickname <nickname>]
                       [--ipalloc-range <cidr> [--ipalloc-default-subnet <cidr>]]
-                      [--no-discovery] [--init-peer-count <count>]
+                      [--no-discovery] [--init-peer-count <count>] [--no-dns]
                       [--trusted-subnets <cidr>,...] <peer> ...
 weave launch-proxy  [-H <endpoint>] [--without-dns]
                       [--no-default-ipalloc] [--no-rewrite-hosts]