Merge branch 'latest_release_doc_updates' into 1.4

site/plugin.md

@@ -3,6 +3,8 @@ title: Using Weave Net via Docker Networking
 layout: default
 ---
 
+# Weave Plugin
+
 New in Docker version 1.9 is a plugin mechanism to add different
 network providers.
 
@@ -18,11 +20,11 @@ you remove this container (e.g. using `weave reset`) before removing
 all endpoints created using `--net=weave`, Docker can
 [hang](https://github.com/docker/libnetwork/issues/813).
 
-## Starting a container:
+## Starting a container
 
     $ docker run --net=weave -ti ubuntu
 
-## Using WeaveDNS for Service Discovery:
+## Using WeaveDNS for Service Discovery
 
 You need to pass the additional arguments `--dns` and `-dns-search`,
 for which we provide a helper in the weave script:
@@ -46,6 +48,11 @@ store](#cluster-store) (like Docker's overlay driver) and one named
 * Supports only a single network (we create one named `weave` for you automatically)
 * Uses Weave's partition tolerant IPAM
 
+If you do create additional networks using the `weavemesh` driver,
+containers attached to them will be able to communicate with
+containers attached to `weave`; there is no isolation between those
+networks.
+
 ### `weave` driver
 
 * This runs in what Docker call "global scope"; requires a cluster store
@@ -56,7 +63,7 @@ There's no specific documentation from Docker on using a cluster
 store, but the first part of [Getting Started with Docker Multi-host Networking][docker-net]
 should point the way.
 
-Note that in the case of multiple docker networks, all containers are
+Note that in the case of multiple networks using the `weave` driver, all containers are
 on the same virtual network but Docker allocates their addresses on
 different subnets so they cannot talk to each other directly.
 

site/weavedns.md

@@ -55,9 +55,8 @@ root@ubuntu:/# ping pingme
 > the hostname is not in the weaveDNS domain the container will *not*
 > be registered, but will still use weaveDNS for resolution.
 
-It is also possible to force or forbid an application container's use
-of weaveDNS with the `--with-dns` and `--without-dns` options to
-`weave run` and `weave launch-proxy`.
+To disable application containers' use of weaveDNS, add the
+`--without-dns` option to `weave run` or `weave launch-proxy`.
 
 ## <a name="how-it-works"></a>How it works
 
@@ -100,7 +99,7 @@ In the event that weaveDNS is launched in this way, it's important that
 other calls to `weave` also specify the bridge device:
 
 ```bash
-$ sudo DOCKER_BRIDGE=someother weave run --with-dns ...
+$ sudo DOCKER_BRIDGE=someother weave run ...
 ```
 
 ## <a name="load-balancing"></a>Load balancing