From c101957fb91fd37a88fa5ea72d43ec0748e112c5 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:46:56 -0500 Subject: [PATCH] replaced URLs for install and docker plugins --- site/install/plugin/plugin-how-it-works.md | 4 ++-- site/install/plugin/plugin-v2.md | 4 ++-- site/install/plugin/plugin.md | 4 ++-- site/install/using-weave.md | 4 ++-- site/install/weave-cloud.md | 4 ++-- site/overview.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/ipam/ipam.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 48f55c1f..28e78d39 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -51,6 +51,6 @@ The plugin accepts the following options via `docker network create ... --opt`: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.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/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 76988c18..6b82b2e1 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -76,5 +76,5 @@ Or to start a container: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index 403211fa..f8633941 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -63,7 +63,7 @@ this between hosts requires that you run Docker in ["swarm mode"](https://docs.d ["key-value store"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#/set-up-a-key-value-store). To operate in swarm mode, you are required to use the plugin v2 of Weave Net. -See [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) for +See [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) for more details. If your Docker installation has a key-value store, create a network @@ -96,4 +96,4 @@ If you are using `systemd` with Docker 1.9, it is advised that you modify the Do **See Also** - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 58ce1799..cae0f8a5 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -137,5 +137,5 @@ 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) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.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 c1ea7ef0..64fa8f03 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -124,5 +124,5 @@ 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) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.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/overview.md b/site/overview.md index bedf4596..7772aa0a 100644 --- a/site/overview.md +++ b/site/overview.md @@ -27,7 +27,7 @@ Weave Net implements service discovery by providing a fast "micro DNS" server at All other Docker networking plugins, including Docker's own "Overlay" driver, require that you set up Docker with a cluster store – a central database like Consul or Zookeeper – before you can even use them. Besides being difficult to set up, maintain and manage, every Docker host must also be in constant contact with the cluster store: if you lose the connection, even temporarily, then you cannot start or stop any containers. Weave Net is bundled with a Docker Network plugin that doesn't require an external cluster store. You can get started right away and you can start and stop containers even when there are network connectivity problems. -For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/plugin/plugin-how-it-works.md). +For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/install/plugin/plugin-how-it-works.md). ### Operates in Partially Connected Networks diff --git a/site/overview/features.md b/site/overview/features.md index 2f17d65a..bfe6a781 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -84,8 +84,8 @@ named `weave` is created by `weave launch`, which is used as follows: Using the Weave plugin enables you to take advantage of [Docker's network functionality](https://docs.docker.com/engine/extend/plugins_network/). There are two plugin implementations for Weave Net: the -["Legacy"](/site/plugin.md) plugin which doesn't require an external -cluster store, and the ["V2"](/site/plugin-v2.md) plugin which +["Legacy"](/site/install/plugin/plugin.md) plugin which doesn't require an external +cluster store, and the ["V2"](/site/install/plugin/plugin-v2.md) plugin which supports Docker swarm mode. ### Weave Network CNI Plugin diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index 4d3b0723..d5351ae5 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -203,4 +203,4 @@ named `weavedb` is used to store this data. **See Also** * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 97ddcf0b..2dd2d6cd 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -28,8 +28,8 @@ Docker containers are started with the --net flag, for example: Note that if a Docker container is started with the --net flag, then the Weave Docker API Proxy is automatically disabled and is not used to attach containers. -See [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) and -[Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md). +See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) and +[Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md). **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.