Move IP Addressing overview under how-it-works and Configuring IP under Using Weave

This commit is contained in:
Bryan Boreham committed 2016-04-18 17:58:07 +01:00
1 parent 3f0a5d9e5d
commit 4d06069138
4 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -114,7 +114,7 @@ Instead of allowing Weave to automatically allocate addresses, an IP address and
specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions.
For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam.md). And also review the
[the basics of IP addressing](/site/ip-addresses.md) for an explanation of addressing and private networks.
[the basics of IP addressing](/how-it-works/ip-addresses.md) for an explanation of addressing and private networks.
###<a name="naming-and-discovery"></a>Naming and Discovery
File renamed without changes.
@@ -1,6 +1,6 @@
---
title: Configuring Weave to Explicitly Use an IP Range
menu_order: 10
menu_order: 15
---
The default configurations for both Weave Net and Docker use [Private
@@ -39,4 +39,4 @@ Networks](https://en.wikipedia.org/wiki/Private_network). For example
**See Also**
* [IP Addresses, Routes and Networks](/site/ip-addresses.md)
* [IP Addresses, Routes and Networks](/how-it-works/ip-addresses.md)
+2 -2
View File
@@ -10,7 +10,7 @@ Containers are automatically allocated an IP address that is unique across the W
Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network.
See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/ip-addresses.md) for further details.
See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/how-it-works/ip-addresses.md) for further details.
Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it.
@@ -52,6 +52,6 @@ Individual IP addresses given to containers must, of course, be unique. If you p
**See Also**
* [Managing Services: Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md)
* [Configuring Weave to Explicitly Use an IP Range](/site/ip-addresses/configuring-weave.md)
* [Configuring Weave to Explicitly Use an IP Range](/site/using-weave/configuring-weave.md)
* [Automatic IP Address Management](/site/ipam.md)