Merge branch '1.4'

site/weavedns/overview-using-weavedns.md

@@ -38,11 +38,10 @@ the hostname is not in the weavedns domain, the container is *not*
 registered, but it will still use weavedns for resolution.
 
 To disable an application container's 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.
 
 **See Also**
 
  * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md)
  * [Load Balancing and Fault Resilience with weavedns](/site/weave-docker-api/load-balance-fault-weavedns.md)
- 

weave

@@ -42,7 +42,7 @@ weave launch        <same arguments as 'weave launch-router'>
       launch-router [--password <pass>] [--name <mac>] [--nickname <nickname>]
                       [--ipam-seed <mac>,...] [--observer]
                       [--ipalloc-range <cidr> [--ipalloc-default-subnet <cidr>]]
-                      [--init-peer-count <count>] [--no-discovery]
+                      [--init-peer-count <count>] [--no-discovery] [--no-dns]
                       [--trusted-subnets <cidr>,...] <peer> ...
       launch-proxy  [-H <endpoint>] [--without-dns] [--no-multicast-route]
                       [--no-rewrite-hosts] [--no-default-ipalloc]