diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md
index 21b534ef..ab2ab5a5 100644
--- a/site/concepts/encryption-implementation.md
+++ b/site/concepts/encryption-implementation.md
@@ -211,4 +211,4 @@ Integrity Check Value of AES-GCM.
* [architecture documentation](https://github.com/weaveworks/weave/blob/master/docs/architecture.txt)
* [fastdp encryption](https://github.com/weaveworks/weave/blob/master/docs/fastdp-crypto.md)
- * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md)
+ * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md)
diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md
index dceafb62..b7d1cb4d 100644
--- a/site/concepts/encryption.md
+++ b/site/concepts/encryption.md
@@ -8,7 +8,7 @@ search_type: Documentation
Weave Net peers
[communicate with each other over both TCP and UDP](/site/concepts/how-it-works.md). This
communication
-[can be encrypted](/site/using-weave/security-untrusted-networks.md).
+[can be encrypted](/site/tasks/manage/security-untrusted-networks.md).
Encryption of control plane traffic (TCP) and data plane traffic (UDP) of sleeve
overlay is accomplished using the [NaCl](http://nacl.cr.yp.to/)
@@ -42,4 +42,4 @@ the IP transformation framework (XFRM).
**See Also**
* [How Weave Implements Encryption](/site/concepts/encryption-implementation.md)
- * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md)
+ * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md)
diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md
index e5640c50..13a092e9 100644
--- a/site/concepts/fastdp-how-it-works.md
+++ b/site/concepts/fastdp-how-it-works.md
@@ -26,6 +26,6 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat
**See Also**
* [Using Weave Net](/site/using-weave.md)
- * [Using Fast Datapath](/site/using-weave/fastdp.md)
+ * [Using Fast Datapath](/site/tasks/manage/fastdp.md)
diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md
index 4bde7068..d5412ec9 100644
--- a/site/concepts/how-it-works.md
+++ b/site/concepts/how-it-works.md
@@ -25,7 +25,7 @@ is given an IP address and netmask supplied either by the user or
by Weave Net's IP address allocator.
Weave Net routes packets between containers on different hosts via two
-methods: a [fast data path](/site/using-weave/fastdp.md) method, which operates
+methods: a [fast data path](/site/tasks/manage/fastdp.md) method, which operates
entirely in kernel space, and a fallback `sleeve` method, in which
packets destined for non-local containers are captured by the kernel
and processed by the Weave Net router in user space, forwarded over
diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md
index 44806eeb..fc031530 100644
--- a/site/concepts/router-encapsulation.md
+++ b/site/concepts/router-encapsulation.md
@@ -5,7 +5,7 @@ search_type: Documentation
---
When the Weave Net router forwards packets to peers in `sleeve` mode
-(rather than via the [fast data path](/site/using-weave/fastdp.md)), the
+(rather than via the [fast data path](/site/tasks/manage/fastdp.md)), the
encapsulation looks something like this:
+-----------------------------------+
diff --git a/site/faq.md b/site/faq.md
index 8cd4d12c..cd267553 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -25,7 +25,7 @@ For more information, refer to [Manually Specifying the IP Address of a Containe
**Q: How do I expose one of my containers to the outside world?**
-Exposing a container to the outside world is described in [Exporting Services](/site/using-weave/service-management.md#exporting).
+Exposing a container to the outside world is described in [Exporting Services](/site/tasks/manage/service-management.md#exporting).
@@ -37,7 +37,7 @@ For example, you have a Weave network that runs on hosts A, B, C. and you have a
A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md).
-Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/using-weave/service-management.md#exporting).
+Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/tasks/manage/service-management.md#exporting).
@@ -71,7 +71,7 @@ For more information about fast datapath see [How Fast Datapath Works](/site/con
To view whether Weave is using fastdp or not, you can run, `weave status connections`
-For more information on this command, see [Using Fast Datapath](/site/using-weave/fastdp.md).
+For more information on this command, see [Using Fast Datapath](/site/tasks/manage/fastdp.md).
@@ -79,12 +79,12 @@ For more information on this command, see [Using Fast Datapath](/site/using-weav
Yes, 1.9 version of Weave Net added the encryption feature to fastdp.
-See [Using Fast Datapath](/site/using-weave/fastdp.md) for more information.
+See [Using Fast Datapath](/site/tasks/manage/fastdp.md) for more information.
**Q: Can I create multiple networks where containers can communicate on one network, but are isolated from containers on other networks?**
-Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/using-weave/application-isolation.md).
+Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/tasks/manage/application-isolation.md).
**Q: Which ports does Weave Net use (e.g. if I am configuring a firewall) ?**
diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md
index 6b82b2e1..24592212 100644
--- a/site/install/plugin/plugin-v2.md
+++ b/site/install/plugin/plugin-v2.md
@@ -34,14 +34,14 @@ There are several configuration parameters which can be set with:
The parameters include:
* `WEAVE_PASSWORD` - if non empty, it will instruct Weave Net to encrypt
- traffic - see [here](/site/using-weave/security-untrusted-networks.md) for
+ traffic - see [here](/site/tasks/manage/security-untrusted-networks.md) for
more details.
* `WEAVE_MULTICAST` - set to 1 on each host running the plugin to enable
multicast traffic on any Weave Net network.
* `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a
smaller size if your underlying network has a tighter limit, or set
a larger size for better performance if your network supports jumbo
- frames - see [here](/site/using-weave/fastdp.md#mtu) for more
+ frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more
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).
diff --git a/site/install/systemd.md b/site/install/systemd.md
index cb32ce9f..16cc99ac 100644
--- a/site/install/systemd.md
+++ b/site/install/systemd.md
@@ -34,9 +34,9 @@ create the `/etc/sysconfig/weave` environment file using the following format:
You can also use the [`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically.
-Additionally, if you want to enable [encryption](/site/using-weave/security-untrusted-networks.md) specify a
+Additionally, if you want to enable [encryption](/site/tasks/manage/security-untrusted-networks.md) specify a
password using `WEAVE_PASSWORD="wfvAwt7sj"` in the `/etc/sysconfig/weave` environment file, and it will get picked up by
-Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/using-weave/security-untrusted-networks.md).
+Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/tasks/manage/security-untrusted-networks.md).
You can now launch Weave Net using
diff --git a/site/install/using-weave.md b/site/install/using-weave.md
index cae0f8a5..088bf8ae 100644
--- a/site/install/using-weave.md
+++ b/site/install/using-weave.md
@@ -93,7 +93,7 @@ Standard firewall rules can be deployed to restrict access to the
Weave Net control and data ports.
For communication across untrusted networks, connections can be
-[encrypted](/site/using-weave/security-untrusted-networks.md).
+[encrypted](/site/tasks/manage/security-untrusted-networks.md).
### Testing Container Communications
@@ -136,6 +136,6 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex
* [Installing Weave Net](/site/install/installing-weave.md)
* [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md)
- * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md)
+ * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md)
* [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md)
* [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md)
diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md
index 64fa8f03..ad72f5fe 100644
--- a/site/install/weave-cloud.md
+++ b/site/install/weave-cloud.md
@@ -123,6 +123,6 @@ connect to it.
* [Installing Weave Net](/site/install/installing-weave.md)
* [Using Weave Net](/site/using-weave.md)
- * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md)
+ * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md)
* [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md)
* [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md)
diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md
index 224310cf..cdf2c4a5 100644
--- a/site/kubernetes/kube-addon.md
+++ b/site/kubernetes/kube-addon.md
@@ -237,7 +237,7 @@ The list of variables you can set is:
* `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a
smaller size if your underlying network has a tighter limit, or set
a larger size for better performance if your network supports jumbo
- frames - see [here](/site/using-weave/fastdp.md#mtu) for more
+ frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more
details.
Example:
diff --git a/site/overview.md b/site/overview.md
index 7772aa0a..850a030e 100644
--- a/site/overview.md
+++ b/site/overview.md
@@ -37,7 +37,7 @@ Weave Net can forward traffic between nodes, and it works even if the mesh netwo
Weave Net automatically chooses the fastest path between two hosts, offering near native throughput and latency, all without your intervention.
-See [How Fast Datapath Works](/site/using-weave/fastdp.md) for more information.
+See [How Fast Datapath Works](/site/tasks/manage/fastdp.md) for more information.
### Network Operations Friendly
diff --git a/site/overview/features.md b/site/overview/features.md
index 33e458c0..2b5540b1 100644
--- a/site/overview/features.md
+++ b/site/overview/features.md
@@ -53,7 +53,7 @@ Weave Net automatically chooses the fastest available method to
transport data between peers. The best performing of these
(the 'fast datapath') offers near-native throughput and latency.
-See [Using Fast Datapath](/site/using-weave/fastdp.md) and
+See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and
[How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md).
### Seamless Docker Integration (Weave Docker API Proxy)
@@ -132,7 +132,7 @@ _isolation-through-subnets_ technique. This common strategy
techniques can be used to deploy your applications to
containers.
-See [Isolating Applications](/site/using-weave/application-isolation.md)
+See [Isolating Applications](/site/tasks/manage/application-isolation.md)
for information on how to use the isolation-through-subnets
technique with Weave Net.
@@ -149,7 +149,7 @@ given container in advance. In these cases, you can take
advantage of Weave's ability to attach and detach running
containers to and from any network.
-See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md)
+See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md)
for details.
@@ -176,7 +176,7 @@ running alongside Weave.
Weave Net implements encryption and security using the Go version of [Daniel J. Bernstein's NaCl library](http://nacl.cr.yp.to/index.html),
and, additionally in the case of encrypted fast datapath using [the cryptography framework of the Linux kernel](https://en.wikipedia.org/wiki/Crypto_API_(Linux)).
-For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md).
+For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md).
### Host Network Integration
@@ -193,7 +193,7 @@ See [Integrating with the Host Network](/site/using-weave/host-network-integrati
* **Binding Services** - A container can be bound to a particular IP and port without having to change your application code, while at the same time will maintain its original endpoint.
* **Routing Services** - By combining the importing and exporting features, you can connect to disjointed networks, even when separated by firewalls and where there may be overlapping IP addresses.
-See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) for instructions on how to manage services on a Weave container network.
+See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) for instructions on how to manage services on a Weave container network.
### Multi-Cloud Networking
@@ -203,7 +203,7 @@ of containers that run on [Google Compute Engine](https://cloud.google.com/compu
(GCE), [Amazon Elastic Compute Cloud](https://aws.amazon.com/ec2/)
(EC2) and in a local data centre all at the same time.
-See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/using-weave/multi-cloud-multi-hop.md).
+See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md).
### Multi-Hop Routing
@@ -213,7 +213,7 @@ even when there is only partial connectivity between the hosts. Weave Net
routes traffic between containers as long as there is at least one *path*
of connected hosts between them.
-See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/using-weave/multi-cloud-multi-hop.md).
+See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md).
### Dynamic Topologies
@@ -230,7 +230,7 @@ reconfiguration or, in many cases, restarts of other containers.
All that is required is for the migrated container to be started
with the same IP address as it was given originally.
-See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md), in particular, Routing Services for more information on container mobility.
+See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md), in particular, Routing Services for more information on container mobility.
### Fault Tolerance
diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md
index ba534aa1..9f624ff8 100644
--- a/site/tasks/ipam/allocation-multi-ipam.md
+++ b/site/tasks/ipam/allocation-multi-ipam.md
@@ -10,7 +10,7 @@ puts all containers into a subnet that spans the entire allocation
range, so that every Weave-attached container can communicate with every other
Weave-attached container.
-If you want some [isolation](/site/using-weave/application-isolation.md), you
+If you want some [isolation](/site/tasks/manage/application-isolation.md), you
can choose to run containers on different subnets. To request the
allocation of an address from a particular subnet, set the
`WEAVE_CIDR` environment variable to `net:` when creating the
@@ -64,5 +64,5 @@ for manual allocation.
**See Also**
* [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
- * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.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)
diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md
index 3edd1feb..2c9ecb71 100644
--- a/site/tasks/ipam/manual-ip-address.md
+++ b/site/tasks/ipam/manual-ip-address.md
@@ -52,7 +52,7 @@ 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)
+ * [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)
diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md
index 67f1113c..6932e34e 100644
--- a/site/tasks/ipam/stop-remove-peers-ipam.md
+++ b/site/tasks/ipam/stop-remove-peers-ipam.md
@@ -58,4 +58,4 @@ dropping attempted connections with peers in other cliques.
* [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
* [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
- * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md)
+ * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md)
diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md
index db1dd76b..eb589c3b 100644
--- a/site/tasks/manage/application-isolation.md
+++ b/site/tasks/manage/application-isolation.md
@@ -67,4 +67,4 @@ isolation between application containers, that feature needs to be disabled by [
**See Also**
* [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
- * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.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 3892d031..10ee2092 100644
--- a/site/tasks/manage/finding-adding-hosts-dynamically.md
+++ b/site/tasks/manage/finding-adding-hosts-dynamically.md
@@ -68,5 +68,5 @@ with `weave launch` and `weave connect` run:
**See Also**
- * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md)
+ * [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)
diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md
index 81788dcb..713fa7b0 100644
--- a/site/tasks/manage/host-network-integration.md
+++ b/site/tasks/manage/host-network-integration.md
@@ -61,4 +61,4 @@ hosts.
* [Using Weave Net](/site/using-weave.md)
* [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md)
- * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md)
+ * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md)
diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md
index f05ecae2..de7cfb49 100644
--- a/site/tasks/manage/security-untrusted-networks.md
+++ b/site/tasks/manage/security-untrusted-networks.md
@@ -54,4 +54,4 @@ Be aware that:
**See Also**
* [Weave Encryption](/site/concepts/encryption.md)
- * [Using Fast Datapath](/site/using-weave/fastdp.md)
+ * [Using Fast Datapath](/site/tasks/manage/fastdp.md)
diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md
index 68504e5b..478a05d4 100644
--- a/site/tasks/manage/service-management.md
+++ b/site/tasks/manage/service-management.md
@@ -114,5 +114,5 @@ For example, you can move the netcat service to `$HOST4:2211` and it will retai
**See Also**
* [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md)
- * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md)
+ * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md)
diff --git a/site/tasks/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md
index d6cdd9e4..6ecf26cb 100644
--- a/site/tasks/weave-docker-api/launching-without-proxy.md
+++ b/site/tasks/weave-docker-api/launching-without-proxy.md
@@ -14,7 +14,7 @@ limitations, we have removed `weave run`.
If you have scripts using `weave run`, you can achieve exactly the
same effect by combining `docker run` and `weave attach`; see
[Dynamically Attaching and Detaching
-Containers](/site/using-weave/dynamically-attach-containers.md) for
+Containers](/site/tasks/manage/dynamically-attach-containers.md) for
details.
The `weave start` and `weave restart` commands have also been removed,
diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md
index 2dd2d6cd..1c825b45 100644
--- a/site/tasks/weave-docker-api/weave-docker-api.md
+++ b/site/tasks/weave-docker-api/weave-docker-api.md
@@ -33,7 +33,7 @@ See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/pl
**3.** Containers can also be attached to the Weave network with `weave attach` commands. This method also
does not use the Weave Docker API Proxy.
-See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md).
+See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md).
### Setting Up The Weave Net Docker API Proxy