From d454e610f1ec4bfc60c668ae1f86d046cca6a19a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 18 Apr 2016 17:13:01 +0100 Subject: [PATCH] Move encryption out of top level --- site/features.md | 2 +- .../encryption-implementation.md} | 3 ++- site/{ => how-it-works}/encryption.md | 4 ++-- site/troubleshooting.md | 2 +- site/using-weave/security-untrusted-networks.md | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename site/{encryption/implementation.md => how-it-works/encryption-implementation.md} (99%) rename site/{ => how-it-works}/encryption.md (94%) diff --git a/site/features.md b/site/features.md index 7905f0d3..4139c0a4 100644 --- a/site/features.md +++ b/site/features.md @@ -181,7 +181,7 @@ running alongside Weave. Weave Net implements encryption and security using [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, [Using Encryption with Weave](/site/encryption.md) and [How Weave Implements Encryption](/site/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](/how-it-works/encryption.md) and [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md). ###Host Network Integration diff --git a/site/encryption/implementation.md b/site/how-it-works/encryption-implementation.md similarity index 99% rename from site/encryption/implementation.md rename to site/how-it-works/encryption-implementation.md index f3055f54..3ee989d4 100644 --- a/site/encryption/implementation.md +++ b/site/how-it-works/encryption-implementation.md @@ -1,10 +1,11 @@ --- title: How Weave Net Implements Encryption layout: default +menu_order: 70 --- This section describes some details of Weave Net's built-in -[encryption](/site/encryption.md): +[encryption](/how-it-works/encryption.md): * [Establishing the Ephemeral Session Key](#ephemeral-key) * [Key Generation](#csprng) diff --git a/site/encryption.md b/site/how-it-works/encryption.md similarity index 94% rename from site/encryption.md rename to site/how-it-works/encryption.md index 54b8b0cf..65c0f6e8 100644 --- a/site/encryption.md +++ b/site/how-it-works/encryption.md @@ -1,6 +1,6 @@ --- title: Encryption and Weave Net -menu_order: 95 +menu_order: 60 --- @@ -34,5 +34,5 @@ deployed. **See Also** - * [How Weave Implements Encryption](/site/encryption/implementation.md) + * [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md) * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 53467820..0ee5139a 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](/site/encryption.md) is in use for communication +[encryption](/how-it-works/encryption.md) is in use for communication between peers. * **PeerDiscovery** - indicates whether diff --git a/site/using-weave/security-untrusted-networks.md b/site/using-weave/security-untrusted-networks.md index 7e0e0241..4e685e85 100644 --- a/site/using-weave/security-untrusted-networks.md +++ b/site/using-weave/security-untrusted-networks.md @@ -45,5 +45,5 @@ Be aware that: **See Also** - * [Using Encryption With Weave Net](/site/encryption.md) + * [Weave Encryption](/how-it-works/encryption.md) * [Using Fast Datapath](/using-weave/fastdp.md)