From 4d060691383feada208355d8c982b6f55bb97e95 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 18 Apr 2016 17:05:34 +0100 Subject: [PATCH] Move IP Addressing overview under how-it-works and Configuring IP under Using Weave --- site/features.md | 2 +- site/{ => how-it-works}/ip-addresses.md | 0 site/{ip-addresses => using-weave}/configuring-weave.md | 4 ++-- site/using-weave/manual-ip-address.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename site/{ => how-it-works}/ip-addresses.md (100%) rename site/{ip-addresses => using-weave}/configuring-weave.md (95%) diff --git a/site/features.md b/site/features.md index 9c81f862..7905f0d3 100644 --- a/site/features.md +++ b/site/features.md @@ -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. ###Naming and Discovery diff --git a/site/ip-addresses.md b/site/how-it-works/ip-addresses.md similarity index 100% rename from site/ip-addresses.md rename to site/how-it-works/ip-addresses.md diff --git a/site/ip-addresses/configuring-weave.md b/site/using-weave/configuring-weave.md similarity index 95% rename from site/ip-addresses/configuring-weave.md rename to site/using-weave/configuring-weave.md index 810dd662..94e552d8 100644 --- a/site/ip-addresses/configuring-weave.md +++ b/site/using-weave/configuring-weave.md @@ -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) diff --git a/site/using-weave/manual-ip-address.md b/site/using-weave/manual-ip-address.md index f5bff319..59bcea78 100644 --- a/site/using-weave/manual-ip-address.md +++ b/site/using-weave/manual-ip-address.md @@ -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)