Adjust section links

2016-04-07 10:51:47 +01:00
1 parent 80770cc96e
commit f183cb491f
@@ -5,7 +5,7 @@ menu_order: 90


 Weave Net peers
-[communicate with each other over both TCP and UDP](/site/router-topology/overview.md). This
+[communicate with each other over both TCP and UDP](/site/router-topology.md). This
 communication
 [can be encrypted](/site/using-weave/security-untrusted-networks.md).

@@ -4,7 +4,7 @@ layout: default
 ---

 This section describes some details of Weave Net's built-in
-[encryption](/site/encryption/crypto-overview.md):
+[encryption](/site/encryption.md):

 * [Establishing the Ephemeral Session Key](#ephemeral-key)
 * [Key Generation](#csprng)
@@ -46,7 +46,7 @@ Once the peers detect the inconsistency, they log the error and drop the connect

 Some peers may be able to communicate their claim to the others before they run `rmpeer` (i.e. it's a race), so what you can expect is a few cliques of peers that are still talking to each other, but repeatedly dropping attempted connections with peers in other cliques.

-For more information on see [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md) and also, [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md)
+For more information on see [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) and also, [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md)


 ###Q: What is the best practise for resetting a node that goes out of service?
@@ -69,7 +69,7 @@ For more information about fast datapath see [How Fast Datapath Works](/site/fas

 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/using-fastdp.md)
+For more information on this command, see [Using Fast Datapath](/site/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/using-fastdp.md) for more information
+See [Using Fast Datapath](/site/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?

@@ -87,7 +87,7 @@ Yes, of course!  Weave allows you to run isolated networks and still allow open

 **See Also**

- * [Troubleshooting Weave](/site/troublehooting.md)
- * [Troubleshooting IPAM](/site/ipam/troubleshooting.md)
+ * [Troubleshooting Weave](/site/troublehooting.md.md)
+ * [Troubleshooting IPAM](/site/ipam.md)
 * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)
 
@@ -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/using-fastdp.md)
+ * [Using Fast Datapath](/site/fastdp.md)


@@ -28,7 +28,7 @@ Net:
 * [Fault Tolerance](#fault-tolerance) 

 For step-by-step instructions on how to use Weave Net, 
-see [Using Weave Net](/site/using-weave/intro-example.md)
+see [Using Weave Net](/site/using-weave.md)

 ###<a name="virtual-ethernet-switch"></a>Virtual Ethernet Switch

@@ -59,12 +59,12 @@ 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/using-fastdp.md) and 
+See [Using Fast Datapath](/site/fastdp.md) and 
 [How Fast Datapath Works](/site/fastdp/fastdp-how-it-works.md). 

 ###<a name="docker"></a>Seamless Docker Integration (Weave Docker API Proxy)

-Weave Net includes a [Docker API Proxy](/site/weave-docker-api/set-up-proxy.md), which can be 
+Weave Net includes a [Docker API Proxy](/site/weave-docker-api.md), which can be 
 used to start containers using the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/), and attach them to the Weave network before they begin execution.

 To use the proxy run
@@ -97,7 +97,7 @@ when there are network connectivity problems.
 >*Note:* The plugin is an *alternative* to the proxy, and therefore you do
 *not* need to run `eval $(weave env)` beforehand.

-See [Using the Weave Docker Network Plugin](/site/plugin/weave-plugin-how-to.md) for more details.
+See [Using the Weave Docker Network Plugin](/site/plugin.md) for more details.


 ###<a name="cniplugin"></a>Weave Network CNI Plugin
@@ -114,13 +114,13 @@ Containers are automatically allocated a unique IP address. To view the addresse
 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. 

-For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam/overview-init-ipam.md). And also review the 
-[the basics of IP addressing](/site/ip-addresses/ip-addresses.md) for an explanation of addressing and private networks. 
+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. 


 ###<a name="naming-and-discovery"></a>Naming and Discovery
 
-Named containers are automatically registered in [weaveDNS](/site/weavedns/overview-using-weavedns.md), 
+Named containers are automatically registered in [weaveDNS](/site/weavedns.md), 
 and are discoverable by using standard, simple name lookups:

    host1$ docker run -dti --name=service ubuntu
@@ -184,7 +184,7 @@ Weave Net implements encryption and security using [Daniel J. Bernstein's NaCl l

 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, [Using Encryption with Weave](/site/encryption/crypto-overview.md) and [How Weave Implements Encryption](/site/encryption/implementation.md)
+and for a more technical discussion on how Weave implements encryption see, [Using Encryption with Weave](/site/encryption.md) and [How Weave Implements Encryption](/site/encryption/implementation.md)


 ###<a name="host-network-integration"></a>Host Network Integration
@@ -38,7 +38,7 @@ for the latest Weave AMIs and

 **See Also** 

- * [Using Weave Net](/site/using-weave/intro-example.md)
+ * [Using Weave Net](/site/using-weave.md)
 * [Getting Started Guides](http://www.weave.works/guides/)
 * [Features](/site/features.md)
 * [Troubleshooting](/site/troubleshooting.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/using-fastdp.md) for more information.
+See [How Fast Datapath Works](/site/fastdp.md) for more information.

 ###Network Operations Friendly

@@ -59,7 +59,7 @@ With Weave Net, deploy your peer-to-peer file sharing applications and voice ove
 Weave Net is a good choice if you want one tool for everything.  For example: In addition to Docker plugins, you can also use Weave as a Kubernetes plugin.  You can also use Weave with Amazon ECS or with Mesos and Marathon.  
 Refer to our Getting Started and Integration Guides for more information.

-For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/features/features.md)
+For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/features.md)



@@ -39,4 +39,4 @@ Networks](https://en.wikipedia.org/wiki/Private_network).  For example

 **See Also**

- * [IP Addresses, Routes and Networks](/site/ip-addresses/ip-addresses.md)
+ * [IP Addresses, Routes and Networks](/site/ip-addresses.md)
@@ -62,6 +62,6 @@ for manual allocation.

 **See Also**

- * [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md)
+ * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md)
 * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md)
 * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md)
@@ -23,7 +23,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/overview-init-ipam.md), and then host3
+[overview example](/site/ipam.md), and then host3
 caught fire, you can go to one of the other hosts and run:

    host1$ weave rmpeer host3
@@ -37,6 +37,6 @@ status`.

 **See Also**

- * [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md)
+ * [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)
@@ -22,7 +22,7 @@ on any of the hosts, and they can all communicate with each other.

 >**Warning!** It is inadvisable to attach containers to the Weave network using the Weave Docker Networking Plugin and Weave Docker API Proxy simultaneously. Such containers will end up with two Weave network interfaces and two IP addresses, which is rarely desirable. To ensure that the proxy is not being used, do not run eval $(weave env), or docker $(weave config).

-In order to use Weave Net's [Service Discovery](/site/weavedns/overview-using-weavedns.md) you
+In order to use Weave Net's [Service Discovery](/site/weavedns.md) you
 must pass the additional arguments `--dns` and `-dns-search`, for
 which a helper is provided in the Weave script:

@@ -29,5 +29,5 @@ route, add the `--no-multicast-route` flag to `weave launch-plugin`.

 **See Also**

- * [Using the Weave Net Docker Network Plugin](/site/plugin/weave-plugin-how-to.md)
+ * [Using the Weave Net Docker Network Plugin](/site/plugin.md)
 * [How the Weave Network Plugin Works](/site/plugin/plugin-how-it-works.md)
@@ -29,6 +29,6 @@ store, but the first part of

 **See Also**

- * [Using the Weave Net Docker Network Plugin](/site/plugin/weave-plugin-how-to.md)
+ * [Using the Weave Net Docker Network Plugin](/site/plugin.md)
 * [Plugin Command-line Arguments](/site/plugin/plug-in-command-line.md)
 
@@ -63,7 +63,7 @@ context with the commands shown below. You will need to have the

 **See Also**

- * [Using Weave Net](/site/using-weave/intro-example.md)
+ * [Using Weave Net](/site/using-weave.md)
 * [Getting Started Guides](http://www.weave.works/guides/)
 * [Features](/site/features.md)
 * [Troubleshooting](/site/troubleshooting.md)
@@ -78,7 +78,7 @@ $ weave status
 ````

 The terms used here are explained further at
-[How Weave Net Works](/site/router-topology/overview.md).
+[How Weave Net Works](/site/router-topology.md).

  * **Version** - shows the Weave Net version.

@@ -92,7 +92,7 @@ can be overridden by using the `--nickname` argument at `weave
 launch`.

 * **Encryption** - indicates whether
-[encryption](/site/encryption/crypto-overview.md) is in use for communication
+[encryption](/site/encryption.md) is in use for communication
 between peers.

 * **PeerDiscovery** - indicates whether
@@ -305,5 +305,5 @@ and the container image versions as git hashes.

 **See Also**

- * [Troubleshooting IPAM](/site/ipam/troubleshooting.md)
+ * [Troubleshooting IPAM](/site/ipam/troubleshooting-ipam.md)
 * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md)
@@ -32,7 +32,7 @@ Where,
 /var/run/Docker.sock: permission denied. Are you trying to connect to a TLS-enabled daemon without TLS?` then you likely need to be 'root' in order to connect to the Docker daemon. If so, run the above and all subsequent commands in a *single* root shell (e.g. one created with `sudo -s`). Do *not* prefix individual commands with `sudo`, since some commands modify environment entries and hence they all need to be executed from the same shell.
 

->**Important!** if you are running the Weave Docker Network Plugin do not run `eval $(weave env)`. See [Using the Weave Net Docker Network Plugin](/site/pluing/weave-plugin-how-to.md) for more information.
+>**Important!** if you are running the Weave Docker Network Plugin do not run `eval $(weave env)`. See [Using the Weave Net Docker Network Plugin](/site/pluing.md) for more information.

 Weave Net must be launched once per host. The relevant container images will be pulled down from Docker Hub on demand during `weave launch`. 

@@ -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/using-fastdp.md)
- * [Using the Weave Net Docker Network Plugin](/site/plugin/weave-plugin-how-to.md)
+ * [Using Fastdp With Weave Net](/site/fastdp.md)
+ * [Using the Weave Net Docker Network Plugin](/site/plugin.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/overview-init-ipam.md) and also an explanation of [the basics of IP addressing](/site/ip-addresses/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](/site/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,5 +53,5 @@ Individual IP addresses given to containers must, of course, be unique. If you p

 * [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) 
- * [Automatic IP Address Management](/site/ipam/overview-init-ipam.md)   
+ * [Automatic IP Address Management](/site/ipam.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/using-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](/site/fastdp.md) for transporting data between peers, since fast datapath does not support encryption.

 Be aware that:

@@ -45,5 +45,5 @@ Be aware that:

 **See Also**

- * [Using Encryption With Weave Net](/site/encryption/crypto-overview.md)
- * [Using Fast Datapath](/site/using-weave/using-fastdap.md)
+ * [Using Encryption With Weave Net](/site/encryption.md)
+ * [Using Fast Datapath](/site/using-weave.md)
@@ -35,5 +35,5 @@ Similar NAT rules to the above can be used to expose services not just to the ou

 **See Also**

- * [Using Weave Net](/site/using-weave/intro-example.md)
+ * [Using Weave Net](/site/using-weave.md)
 * [Managing Services in Weave Net: Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md)
@@ -3,9 +3,9 @@ title: Using Automatic Discovery With the Weave Net Proxy
 menu_order: 30
 ---

-Containers launched via the proxy use [weaveDNS](/site/weavedns/overview-using-weavedns.md)
+Containers launched via the proxy use [weaveDNS](/site/weavedns.md)
 automatically if it is running when they are started -
-see the [weaveDNS usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth
+see the [weaveDNS usage](/site/weavedns.md#usage) section for an in depth
 explanation of the behaviour and how to control it.

 Typically, the proxy passes on container names as-is to weaveDNS
@@ -4,7 +4,7 @@ layout: default
 ---


-If [automatic IP address allocation](/site/ipam/overview-init-ipam.md) is enabled in Weave Net (by default IPAM is enabled),
+If [automatic IP address allocation](/site/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*.

@@ -37,5 +37,5 @@ container with a blank `WEAVE_CIDR`, for example:
    
 **See Also**

- * [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md)
+ * [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)    
@@ -41,6 +41,6 @@ containers using `docker start` and attaches them to the Weave network.

 **See Also**

- * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
+ * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
 * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md)
 * [Name Resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md)
@@ -55,4 +55,4 @@ proxy port.

 **See Also**

- * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
+ * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
@@ -9,7 +9,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/overview-init-ipam.md) and connected to the
+[automatically assigned IP addresses](/site/ipam.md) and connected to the
 Weave network.  

 ###Creating and Starting Containers with the Weave Net Proxy
@@ -56,6 +56,6 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`.

 **See Also**

- * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api/set-up-proxy.md)
+ * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md)
 * [Securing Docker Communications With TLS](securing-proxy.md)
 * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md)
@@ -44,5 +44,5 @@ disable weaveDNS itself, launch weave with the `--no-dns` option.

 **See Also**

- * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md)
+ * [How Weave Finds Containers](/site/weave-docker-api.md)
 * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md)
@@ -54,6 +54,6 @@ $ sudo DOCKER_BRIDGE=someother weave run ...

 **See Also**

- * [Using WeaveDNS](/site/weavedns/overview-using-weavedns.md)
+ * [Using WeaveDNS](/site/weavedns.md)
 * [Load Balancing with weaveDNS](/site/weavedns/load-balance-fault-weavedns.md)
 * [Managing Domain Entries](/site/weavedns/managing-domains-weavedns.md)
@@ -10,7 +10,7 @@ weaveDNS returns all addresses, in a random order, for each request.
 This provides a basic load balancing capability.

 Expanding the
-[overview example](/site/weavedns/overview-using-weavedns.md), let us
+[overview example](/site/weavedns.md), let us
 start an additional `pingme` container on a 2nd host, and then run
 some ping tests...

@@ -47,6 +47,6 @@ container that is still alive.

 **See Also**

- * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md)
+ * [How Weave Finds Containers](/site/weave-docker-api.md)
 * [Managing Domains](/site/weavedns/managing-domains-weavedns.md)
 * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md)
@@ -46,6 +46,6 @@ link-local as per [RFC6762](https://tools.ietf.org/html/rfc6762),
 (though this is not strictly necessary).


- * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md)
+ * [How Weave Finds Containers](/site/weave-docker-api.md)
 * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md)
 * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md)
@@ -82,6 +82,6 @@ weaveDNS instance will receive.

 **See Also**

- * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md)
+ * [How Weave Finds Containers](/site/weave-docker-api.md)
 * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md)
 * [Managing Domains](/site/weavedns/managing-domains-weavedns.md)