Adjust section links

This commit is contained in:
Adam Harrison committed 2016-04-07 10:51:47 +01:00
1 parent 80770cc96e
commit f183cb491f
29 files changed
+53 -53

No files matched your search

@@ -3,9 +3,9 @@ title: Using Automatic Discovery With the Weave Net Proxy
menu_order: 30
---
Containers launched via the proxy use [weaveDNS](/site/weavedns/overview-using-weavedns.md)
Containers launched via the proxy use [weaveDNS](/site/weavedns.md)
automatically if it is running when they are started -
see the [weaveDNS usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth
see the [weaveDNS usage](/site/weavedns.md#usage) section for an in depth
explanation of the behaviour and how to control it.
Typically, the proxy passes on container names as-is to weaveDNS
+2 -2
View File
@@ -4,7 +4,7 @@ layout: default
---
If [automatic IP address allocation](/site/ipam/overview-init-ipam.md) is enabled in Weave Net (by default IPAM is enabled),
If [automatic IP address allocation](/site/ipam.md) is enabled in Weave Net (by default IPAM is enabled),
then containers started via the proxy are automatically assigned an IP address, *without having to specify any
special environment variables or any other options*.
@@ -37,5 +37,5 @@ container with a blank `WEAVE_CIDR`, for example:
**See Also**
* [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md)
* [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
* [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md)
@@ -41,6 +41,6 @@ containers using `docker start` and attaches them to the Weave network.
**See Also**
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
* [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md)
* [Name Resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md)
+1 -1
View File
@@ -55,4 +55,4 @@ proxy port.
**See Also**
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
+2 -2
View File
@@ -9,7 +9,7 @@ modified to wait for the Weave network interface to become
available.
When they are started via the Weave Net proxy, containers are
[automatically assigned IP addresses](/site/ipam/overview-init-ipam.md) and connected to the
[automatically assigned IP addresses](/site/ipam.md) and connected to the
Weave network.
###Creating and Starting Containers with the Weave Net Proxy
@@ -56,6 +56,6 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`.
**See Also**
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
* [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
* [Securing Docker Communications With TLS](securing-proxy.md)
* [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md)