Merge branch 'master' into 276_alternative_password_supply

This commit is contained in:
Matthias Radestock committed 2014-12-20 00:21:35 +00:00
commit 2386e75cc1
1 file changed
+2 -1
+2 -1
View File
@@ -136,7 +136,8 @@ launching weave, e.g.
The same password must be specified for all weave peers; it is a
component in the creation of ephemeral session keys for connections
between peers.
between peers. See the
[crypto documentation](how-it-works.html#crypto) for more details.
### <a name="host-network-integration"></a>Host network integration