diff --git a/site/concepts/ip-addresses.md b/site/concepts/ip-addresses.md
index 66210e38..e510c1c6 100644
--- a/site/concepts/ip-addresses.md
+++ b/site/concepts/ip-addresses.md
@@ -8,7 +8,7 @@ search_type: Documentation
Weave Net runs containers on a private network, which means that IP addresses are isolated from the rest of the
Internet, and that you don't have to worry about addresses clashing.
-You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md)
+You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md)
### Some Definitions
@@ -64,4 +64,4 @@ find a match, so uses the default rule.
**See Also**
- * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md)
+ * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md)
diff --git a/site/faq.md b/site/faq.md
index f970431a..1e0cd0fd 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -19,7 +19,7 @@ See [Troubleshooting Weave - List attached containers](/site/troubleshooting.md#
You can manually change the IP of a container using [Classless Inter-Domain Routing or CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing).
-For more information, refer to [Manually Specifying the IP Address of a Container](/site/using-weave/manual-ip-address.md).
+For more information, refer to [Manually Specifying the IP Address of a Container](/site/tasks/ipam/manual-ip-address.md).
@@ -45,7 +45,7 @@ Yet another option is to expose a port from the container on host B and then con
Under normal circumstances, this should never happen, but it can occur if `weave rmpeer` was run on more than one host.
-For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md).
+For more information see [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md).
@@ -53,7 +53,7 @@ For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop
When a node goes out of service, the best option is to call `weave rmpeer` on one host and then `weave forget` on all the other hosts.
-See [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) for an in-depth discussion.
+See [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for an in-depth discussion.
@@ -116,6 +116,6 @@ Ubuntu image with those two commands added.
**See Also**
* [Troubleshooting Weave](/site/troubleshooting.md)
- * [Troubleshooting IPAM](/site/ipam.md)
+ * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md)
* [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)
diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md
index 24592212..be5ecb4d 100644
--- a/site/install/plugin/plugin-v2.md
+++ b/site/install/plugin/plugin-v2.md
@@ -45,7 +45,7 @@ The parameters include:
details.
* `IPALLOC_RANGE` - the range of IP addresses used by Weave Net and the subnet
they are placed in (CIDR format; default 10.32.0.0/12).
- See [here](/site/using-weave/configuring-weave.md) for more details.
+ See [here](/site/tasks/ipam/configuring-weave.md) for more details.
Before setting any parameter, the plugin has to be disabled with:
diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md
index ad72f5fe..9d5260a2 100644
--- a/site/install/weave-cloud.md
+++ b/site/install/weave-cloud.md
@@ -110,12 +110,12 @@ error message in its log and exit. To check the logs run:
host1$ docker logs weave
When a Weave Net instance is formed for the first time, the peers must
-initialize the [IP Allocation Manager](/site/ipam.md). This process,
+initialize the [IP Allocation Manager](/site/tasks/ipam/ipam.md). This process,
and the configuration options available, are unchanged when using
Weave Cloud.
When you shut down a peer for good, use [the `weave reset`
-command](/site/ipam/stop-remove-peers-ipam.md) and it will be removed
+command](/site/tasks/ipam/stop-remove-peers-ipam.md) and it will be removed
from the Weave Cloud database so future peers will not attempt to
connect to it.
diff --git a/site/operational-guide/concepts.md b/site/operational-guide/concepts.md
index 8a77f1e1..0ffda7b6 100644
--- a/site/operational-guide/concepts.md
+++ b/site/operational-guide/concepts.md
@@ -85,7 +85,7 @@ partition, healing automatically once the partition is over.
## IP Address Manager (IPAM)
-[IPAM](/site/ipam.md) is the subsystem responsible for dividing up a
+[IPAM](/site/tasks/ipam/ipam.md) is the subsystem responsible for dividing up a
large contiguous block of IP addresses (known as the IP allocation
range) amongst peers so that individual addresses may be uniquely
assigned to containers anywhere on the overlay network.
diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md
index 3cb14c87..703773f4 100644
--- a/site/operational-guide/tasks.md
+++ b/site/operational-guide/tasks.md
@@ -66,7 +66,7 @@ after which one of the remaining peers could decide unilaterally that
it is safe to appropriate the space for itself, and so an
administrative action is required to reclaim it.
-The [`weave rmpeer`](/site/ipam/stop-remove-peers-ipam.md)
+The [`weave rmpeer`](/site/tasks/ipam/stop-remove-peers-ipam.md)
command is provided to perform this task, and must
be executed on _one_ of the remaining peers. That peer will then take
ownership of the freed address space.
@@ -115,6 +115,6 @@ you can issue the following command:
**See Also**
- * [Allocating IP Addresses](/site/ipam.md)
- * [Troubleshooting the IP Allocator](/site/ipam/troubleshooting-ipam.md)
+ * [Allocating IP Addresses](/site/tasks/ipam/ipam.md)
+ * [Troubleshooting the IP Allocator](/site/tasks/ipam/troubleshooting-ipam.md)
diff --git a/site/overview/features.md b/site/overview/features.md
index f31f683d..44eb9953 100644
--- a/site/overview/features.md
+++ b/site/overview/features.md
@@ -100,9 +100,9 @@ See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) f
Containers are automatically allocated a unique IP address. To view the addresses allocated by Weave, run `weave ps`.
Instead of allowing Weave to automatically allocate addresses, an IP address and a network can be explicitly
-specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions.
+specified. See [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/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
+For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/tasks/ipam/ipam.md). And also review the
[the basics of IP addressing](/site/concepts/ip-addresses.md) for an explanation of addressing and private networks.
diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md
index 9f624ff8..908e74e4 100644
--- a/site/tasks/ipam/allocation-multi-ipam.md
+++ b/site/tasks/ipam/allocation-multi-ipam.md
@@ -63,6 +63,6 @@ for manual allocation.
**See Also**
- * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
+ * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md)
* [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md)
- * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md)
+ * [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md)
diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md
index d5351ae5..97be9031 100644
--- a/site/tasks/ipam/ipam.md
+++ b/site/tasks/ipam/ipam.md
@@ -202,5 +202,5 @@ named `weavedb` is used to store this data.
**See Also**
- * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
+ * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md)
* [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md)
diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md
index 2c9ecb71..78287e1b 100644
--- a/site/tasks/ipam/manual-ip-address.md
+++ b/site/tasks/ipam/manual-ip-address.md
@@ -11,7 +11,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/concepts/ip-addresses.md) for further details.
+See the [Automatic IP Address Management](/site/tasks/ipam/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/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.
@@ -53,6 +53,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/tasks/manage/service-management.md)
- * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md)
- * [Automatic IP Address Management](/site/ipam.md)
+ * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md)
+ * [Automatic IP Address Management](/site/tasks/ipam/ipam.md)
diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md
index 6932e34e..c70f033a 100644
--- a/site/tasks/ipam/stop-remove-peers-ipam.md
+++ b/site/tasks/ipam/stop-remove-peers-ipam.md
@@ -24,7 +24,7 @@ later rejoin the Weave network, the same IP address may be allocated
twice.
Assume you had started the three peers in the
-[overview example](/site/ipam.md), and then host3
+[overview example](/site/tasks/ipam/ipam.md), and then host3
caught fire, you can go to one of the other hosts and run:
host1$ weave rmpeer host3
@@ -56,6 +56,6 @@ dropping attempted connections with peers in other cliques.
**See Also**
- * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
- * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
+ * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md)
+ * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md)
* [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md)
diff --git a/site/tasks/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md
index e0ac44ee..34f46277 100644
--- a/site/tasks/ipam/troubleshooting-ipam.md
+++ b/site/tasks/ipam/troubleshooting-ipam.md
@@ -64,4 +64,4 @@ Columns are as follows:
ipam` was run; whilst this could be a transient condition due to a
partition, it may be because the peer has failed and needs to be
removed administratively - see [Starting, Stopping and Removing
- Peers](/site/ipam/stop-remove-peers-ipam.md) for more details.
+ Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for more details.
diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md
index eb589c3b..d479c340 100644
--- a/site/tasks/manage/application-isolation.md
+++ b/site/tasks/manage/application-isolation.md
@@ -66,5 +66,5 @@ isolation between application containers, that feature needs to be disabled by [
**See Also**
- * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
+ * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md)
* [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md)
diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md
index 10ee2092..12dc350a 100644
--- a/site/tasks/manage/finding-adding-hosts-dynamically.md
+++ b/site/tasks/manage/finding-adding-hosts-dynamically.md
@@ -69,4 +69,4 @@ with `weave launch` and `weave connect` run:
**See Also**
* [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md)
- * [Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md)
+ * [Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md)
diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md
index 713fa7b0..ea9afbeb 100644
--- a/site/tasks/manage/host-network-integration.md
+++ b/site/tasks/manage/host-network-integration.md
@@ -53,7 +53,7 @@ for example, `10.2.0.0/16` or `10.32.0.0/12` and,
* `` is the address of the machine on which you ran `weave expose`.
>**Note:** You must ensure that the [IP subnet used by Weave
-Net](/site/ipam.md#range) does not clash with anything on those other
+Net](/site/tasks/ipam/ipam.md#range) does not clash with anything on those other
hosts.
diff --git a/site/tasks/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md
index 231ca9e8..8b81bdae 100644
--- a/site/tasks/weave-docker-api/ipam-proxy.md
+++ b/site/tasks/weave-docker-api/ipam-proxy.md
@@ -5,7 +5,7 @@ search_type: Documentation
---
-If [automatic IP address allocation](/site/ipam.md) is enabled in Weave Net (by default IPAM is enabled),
+If [automatic IP address allocation](/site/tasks/ipam/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*.
@@ -38,5 +38,5 @@ container with a blank `WEAVE_CIDR`, for example:
**See Also**
- * [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)
+ * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md)
+ * [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md)
diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md
index aa46b0b5..913271fc 100644
--- a/site/tasks/weave-docker-api/using-proxy.md
+++ b/site/tasks/weave-docker-api/using-proxy.md
@@ -10,7 +10,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.md) and connected to the
+[automatically assigned IP addresses](/site/tasks/ipam/ipam.md) and connected to the
Weave network.
### Creating and Starting Containers with the Weave Net Proxy
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 9e31a2a0..80846668 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -99,7 +99,7 @@ launch`.
between peers.
* **PeerDiscovery** - indicates whether
-[automatic peer discovery](/site/ipam/allocation-multi-ipam.md) is
+[automatic peer discovery](/site/tasks/ipam/allocation-multi-ipam.md) is
enabled (which is the default).
* **Targets** - are the number of hosts that the local Weave Router has been
@@ -307,5 +307,5 @@ and the container image versions as git hashes.
**See Also**
- * [Troubleshooting IPAM](/site/ipam/troubleshooting-ipam.md)
+ * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md)
* [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)