Merge branch '1.5'

site/plugin.md

@@ -57,6 +57,30 @@ then run your containers using the Docker command-line:
     64 bytes from 10.32.0.2: icmp_seq=2 ttl=64 time=0.052 ms
 
 
+###<a name="multi"></a>Creating multiple Docker Networks
+
+Docker enables you to create multiple independent networks and attach
+different sets of containers to each network. However, coordinating
+this between hosts, Docker requires that you configure a
+["key-value store"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#step-1-set-up-a-key-value-store).
+
+If your Docker installation has a key-value store, create a network
+based on Weave Net as follows:
+
+    $ docker network create --driver=weave mynetwork
+
+then use it to connect a container:
+
+    $ docker run --net=mynetwork ...
+
+or
+
+    $ docker network connect mynetwork somecontainer
+
+Containers attached to different Docker Networks are
+[isolated through subnets](https://www.weave.works/docs/net/latest/using-weave/application-isolation/).
+
+
 ###<a name="restarting"></a>Restarting the Plugin
 
 The plugin, like all Weave Net components, is started with a policy of `--restart=always`, so that it is always there after a restart or reboot. If you remove this container (for example, when using `weave reset`) before removing all endpoints created using `--net=weave`, Docker may hang for a long time when it subsequently tries to re-establish communications to the plugin.

site/weave-docker-api/using-proxy.md

@@ -20,9 +20,8 @@ To create and start a container via the Weave Net proxy run:
 
 or, equivalently run:
 
-    host1$ docker create -ti ubuntu
-    5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382
-    host1$ docker start 5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382
+    host1$ docker create -ti --name=foo ubuntu
+    host1$ docker start foo
 
 Specific IP addresses and networks can be supplied in the `WEAVE_CIDR`
 environment variable, for example:

site/weavedns/managing-domains-weavedns.md

@@ -10,12 +10,10 @@ The following topics are discussed:
 
 ## <a name="domain-search-path"></a>Configuring the domain search paths
 
-If you don't supply a domain search path (with `--dns-search=`),
-`weave run ...` tells a container to look for "bare" hostnames, like
-`pingme`, in its own domain (or in `weave.local` if it has no domain).
-That's why you can just invoke `ping pingme` above -- since the
-hostname is `ubuntu.weave.local`, it will look for
-`pingme.weave.local`.
+If you don't supply a domain search path (with `--dns-search=`), Weave
+Net (via the [proxy](/site/weave-docker-api.md) or via `weave run`)
+tells a container to look for "bare" hostnames, like `pingme`, in its
+own domain (or in `weave.local` if it has no domain).
 
 If you want to supply other entries for the domain search path,
 e.g. if you want containers in different sub-domains to resolve