Move encryption out of top level

This commit is contained in:
Bryan Boreham committed 2016-04-18 18:00:09 +01:00
1 parent 4d06069138
commit d454e610f1
5 files changed
+7 -6

No files matched your search

+1 -1
View File
@@ -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).
###<a name="host-network-integration"></a>Host Network Integration
@@ -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)
@@ -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)
+1 -1
View File
@@ -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
@@ -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)