From bd3b3791c6b81f589f8fbd43b900b7fcf70bd018 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 27 Apr 2016 18:37:28 +0100 Subject: [PATCH 1/2] tweak 'Using Weave Net' section order - move "Managing Services in Weave Net" up so it comes after "Integrating a Host Network with Weave Net", to which it is deeply related - move "Adding and Removing Hosts Dynamically" down so it is adjacent to the other sections which talk about peer connectivity --- site/using-weave/finding-adding-hosts-dynamically.md | 2 +- site/using-weave/service-management.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/using-weave/finding-adding-hosts-dynamically.md b/site/using-weave/finding-adding-hosts-dynamically.md index b194b618..9c4bf072 100644 --- a/site/using-weave/finding-adding-hosts-dynamically.md +++ b/site/using-weave/finding-adding-hosts-dynamically.md @@ -1,6 +1,6 @@ --- title: Adding and Removing Hosts Dynamically -menu_order: 50 +menu_order: 90 --- diff --git a/site/using-weave/service-management.md b/site/using-weave/service-management.md index f4921d4c..a866ceca 100644 --- a/site/using-weave/service-management.md +++ b/site/using-weave/service-management.md @@ -1,6 +1,6 @@ --- title: Managing Services in Weave Net - Exporting, Importing, Binding and Routing -menu_order: 90 +menu_order: 70 --- This section contains the following topics: From 9243bc2b0aeaa651f8e1e0cde064ac43270dd0ad Mon Sep 17 00:00:00 2001 From: abuehrle Date: Wed, 27 Apr 2016 13:25:32 -0500 Subject: [PATCH 2/2] fixed broken links --- site/faq.md | 2 +- site/features.md | 4 ++-- site/troubleshooting.md | 2 +- site/weave-docker-api.md | 2 +- site/weave-docker-api/using-proxy.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/faq.md b/site/faq.md index 3c8c5d9c..9f26a97f 100644 --- a/site/faq.md +++ b/site/faq.md @@ -93,7 +93,7 @@ which are Weave’s control and data ports. **See Also** - * [Troubleshooting Weave](/site/troublehooting.md) + * [Troubleshooting Weave](/site/troubleshooting.md) * [Troubleshooting IPAM](/site/ipam.md) * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) diff --git a/site/features.md b/site/features.md index ecf15706..78ad3fe4 100644 --- a/site/features.md +++ b/site/features.md @@ -111,7 +111,7 @@ Instead of allowing Weave to automatically allocate addresses, an IP address and 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.md). And also review the -[the basics of IP addressing](/how-it-works/ip-addresses.md) for an explanation of addressing and private networks. +[the basics of IP addressing](/site/how-it-works/ip-addresses.md) for an explanation of addressing and private networks. ###Naming and Discovery @@ -178,7 +178,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). -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](/how-it-works/encryption.md) and [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md). +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/how-it-works/encryption.md) and [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md). ###Host Network Integration diff --git a/site/troubleshooting.md b/site/troubleshooting.md index eb719acf..4f67e739 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -94,7 +94,7 @@ can be overridden by using the `--nickname` argument at `weave launch`. * **Encryption** - indicates whether -[encryption](/how-it-works/encryption.md) is in use for communication +[encryption](/site/how-it-works/encryption.md) is in use for communication between peers. * **PeerDiscovery** - indicates whether diff --git a/site/weave-docker-api.md b/site/weave-docker-api.md index 41672f66..179948b0 100644 --- a/site/weave-docker-api.md +++ b/site/weave-docker-api.md @@ -71,7 +71,7 @@ to the original settings prior to stopping the proxy. **See Also** * [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md) - * [Securing Docker Communications With TLS](securing-proxy.md) + * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md) diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index 70a1073e..3d578bb7 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -57,5 +57,5 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`. **See Also** * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md) - * [Securing Docker Communications With TLS](securing-proxy.md) + * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md)