diff --git a/site/faq.md b/site/faq.md index 2797b597..b6008219 100644 --- a/site/faq.md +++ b/site/faq.md @@ -62,14 +62,14 @@ All virtualization techniques have some overhead, and Weave's overhead is typica Weave Net also automatically uses the fastest datapath between two hosts. When Weave Net can't use the fast datapath between two hosts, it falls back to the slower packet forwarding approach. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast datapath within the data centers, but not for the more constrained network link between them. -For more information about fast datapath see [How Fast Datapath Works](/site/fastdp/fastdp-how-it-works.md) +For more information about fast datapath see [How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md) **Q:How can I tell if Weave is using fast datapath (fastdp) or not?** 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/fastdp.md) +For more information on this command, see [Using Fast Datapath](/using-weave/fastdp.md) **Q: Does encryption work with fastdp?** @@ -78,7 +78,7 @@ Encryption does not work with fast datapath. If you enable encryption using the You can however have a mixture of fast datapath connections over trusted links, as well as, encrypted connections over untrusted links. -See [Using Fast Datapath](/site/fastdp.md) for more information +See [Using Fast Datapath](/using-weave/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?** diff --git a/site/features.md b/site/features.md index dcddfa6c..9c81f862 100644 --- a/site/features.md +++ b/site/features.md @@ -58,8 +58,8 @@ Fast datapath does not support encryption. For full details on configuring Weave when you have connections that traverse untrusted networks, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) for more details. -See [Using Fast Datapath](/site/fastdp.md) and -[How Fast Datapath Works](/site/fastdp/fastdp-how-it-works.md). +See [Using Fast Datapath](/using-weave/fastdp.md) and +[How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md). ###Seamless Docker Integration (Weave Docker API Proxy) diff --git a/site/how-it-works.md b/site/how-it-works.md index 3c701b58..361b1dd3 100644 --- a/site/how-it-works.md +++ b/site/how-it-works.md @@ -27,7 +27,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/fastdp.md) method, which operates +methods: a [fast data path](/using-weave/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/fastdp/fastdp-how-it-works.md b/site/how-it-works/fastdp-how-it-works.md similarity index 96% rename from site/fastdp/fastdp-how-it-works.md rename to site/how-it-works/fastdp-how-it-works.md index 55ecda4d..84d8c3dc 100644 --- a/site/fastdp/fastdp-how-it-works.md +++ b/site/how-it-works/fastdp-how-it-works.md @@ -1,6 +1,6 @@ --- title: How Fast Datapath Works -menu_order: 10 +menu_order: 30 --- @@ -25,6 +25,6 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** * [Deploying Applications to Weave](/site/using-weave/deploying-applications.md) - * [Using Fast Datapath](/site/fastdp.md) + * [Using Fast Datapath](/using-weave/fastdp.md) diff --git a/site/how-it-works/router-encapsulation.md b/site/how-it-works/router-encapsulation.md index 44cd5cde..6f65025e 100644 --- a/site/how-it-works/router-encapsulation.md +++ b/site/how-it-works/router-encapsulation.md @@ -4,7 +4,7 @@ menu_order: 10 --- When the Weave Net router forwards packets to peers in `sleeve` mode -(rather than via the [fast data path](/site/fastdp.md)), the +(rather than via the [fast data path](/using-weave/fastdp.md)), the encapsulation looks something like this: +-----------------------------------+ diff --git a/site/fastdp/weave-frame-encapsulation-178x300.png b/site/how-it-works/weave-frame-encapsulation-178x300.png similarity index 100% rename from site/fastdp/weave-frame-encapsulation-178x300.png rename to site/how-it-works/weave-frame-encapsulation-178x300.png diff --git a/site/fastdp/weave-net-encap1-1024x459.png b/site/how-it-works/weave-net-encap1-1024x459.png similarity index 100% rename from site/fastdp/weave-net-encap1-1024x459.png rename to site/how-it-works/weave-net-encap1-1024x459.png diff --git a/site/fastdp/weave-net-fdp1-1024x454.png b/site/how-it-works/weave-net-fdp1-1024x454.png similarity index 100% rename from site/fastdp/weave-net-fdp1-1024x454.png rename to site/how-it-works/weave-net-fdp1-1024x454.png diff --git a/site/introducing-weave.md b/site/introducing-weave.md index e65d715d..5be2968d 100644 --- a/site/introducing-weave.md +++ b/site/introducing-weave.md @@ -36,7 +36,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/fastdp.md) for more information. +See [How Fast Datapath Works](/using-weave/fastdp.md) for more information. ###Network Operations Friendly diff --git a/site/using-weave/deploying-applications.md b/site/using-weave/deploying-applications.md index f784da00..ae1bf61a 100644 --- a/site/using-weave/deploying-applications.md +++ b/site/using-weave/deploying-applications.md @@ -108,5 +108,5 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex **See Also** * [Installing Weave Net](/site/installing-weave.md) - * [Using Fastdp With Weave Net](/site/fastdp.md) + * [Using Fastdp With Weave Net](/using-weave/fastdp.md) * [Using the Weave Net Docker Network Plugin](/site/plugin.md) diff --git a/site/fastdp.md b/site/using-weave/fastdp.md similarity index 93% rename from site/fastdp.md rename to site/using-weave/fastdp.md index 58057099..9f6d79ab 100644 --- a/site/fastdp.md +++ b/site/using-weave/fastdp.md @@ -8,7 +8,7 @@ The most important thing to know about fast datapath is that you don't need to c When Weave Net cannot use the fast data path between two hosts, it falls back to a slower packet forwarding approach called `sleeve`. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast data path within the data centers, but not for the more constrained network link between them. -See [How Fastdp Works](/site/fastdp/fastdp-how-it-works.md) for a more in-depth discussion of this feature. +See [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) for a more in-depth discussion of this feature. ###Disabling Fast Datapath @@ -45,5 +45,5 @@ Where fastdp indicates that fast datapath is being used on a connection. If fast **See Also** * [Deploying Applications to Weave](/site/using-weave/deploying-applications.md) - * [How Fastdp Works](/site/fastdp/fastdp-how-it-works.md) + * [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) diff --git a/site/using-weave/security-untrusted-networks.md b/site/using-weave/security-untrusted-networks.md index 7a77605e..7e0e0241 100644 --- a/site/using-weave/security-untrusted-networks.md +++ b/site/using-weave/security-untrusted-networks.md @@ -34,7 +34,7 @@ password at `weave launch` the router falls back to a slower If some of your peers are co-located in a trusted network (for example within the boundary of your own data center) you can use the `--trusted-subnets` argument to `weave launch` to selectively disable data plane encryption as an optimization. ->**Note:** Both peers must consider the other to be in a trusted subnet for this to take place - if they do not agree, Weave Net [falls back to a slower method](/site/fastdp.md) for transporting data between peers, since fast datapath does not support encryption. +>**Note:** Both peers must consider the other to be in a trusted subnet for this to take place - if they do not agree, Weave Net [falls back to a slower method](/using-weave/fastdp.md) for transporting data between peers, since fast datapath does not support encryption. Be aware that: @@ -46,4 +46,4 @@ Be aware that: **See Also** * [Using Encryption With Weave Net](/site/encryption.md) - * [Using Fast Datapath](/site/fastdp.md) + * [Using Fast Datapath](/using-weave/fastdp.md)