Merge branch 'latest_release_doc_updates' into 1.0

This commit is contained in:
Matthias Radestock committed 2015-07-03 11:45:37 +01:00
commit 9e32605183
1 file changed
+4 -3
+4 -3
View File
@@ -73,9 +73,10 @@ Finally, WeaveDNS containers can be stopped with `stop-dns`.
The weaveDNS container running on every host acts as the nameserver
for containers on that host. It learns about hostnames for local
containers from the proxy and from the `weave run` command. If a
hostname is in the `.weave.local` domain then weaveDNS records the
association of that name with the container's weave IP address(es).
containers from the Weave Docker API proxy and from the `weave run`
command. If a hostname is in the `.weave.local` domain then weaveDNS
records the association of that name with the container's weave IP
address(es).
When weaveDNS is queried for a name in the `.weave.local` domain, it
first checks its own records. If the name is not found there, it asks