X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=website%2Findex.mdwn;h=a3329d420a46b4065d5f597e2427c6c0c086fc43;hb=d7243d30672fdfade1231e45b6413e6bbf9a7866;hp=5c8a69497631faa15569647e4aa9effef3445b8c;hpb=db1f7998d39580765134cfb998ad276f8df5af77;p=monkeysphere.git

diff --git a/website/index.mdwn b/website/index.mdwn
index 5c8a694..a3329d4 100644
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -1,16 +1,20 @@
-The Monkeysphere project's goal is to extend the web of trust model
-and other features of OpenPGP to other areas of the Internet to help
-us securely identify each other while we work online.
+[[!template id="nav"]]
 
-Specifically, the Monkeysphere is a framework to leverage the OpenPGP
-web of trust for OpenSSH authentication.  In other words, it allows
-you to use your OpenPGP keys when using secure shell to both identify
-yourself and the servers you administer or connect to.  OpenPGP keys
-are tracked via GnuPG, and managed in the `known_hosts` and
-`authorized_keys` files used by OpenSSH for connection authentication.
+[[toc ]]
 
-[[bugs]] | [[download]] | [[news]] | [[documentation|doc]] |
-[[development|dev]]
+The Monkeysphere project's goal is to extend OpenPGP's web of trust to
+new areas of the Internet to help us securely identify each other
+while we work online.
+
+Specifically, monkeysphere currently offers a framework to leverage
+the OpenPGP web of trust for OpenSSH authentication.
+
+In other words, it allows you to use secure shell as you normally do,
+but to identify yourself and the servers you administer or connect to
+with your OpenPGP keys.  OpenPGP keys are tracked via GnuPG, and
+monkeysphere manages the `known_hosts` and `authorized_keys` files
+used by OpenSSH for authentication, checking them for cryptographic
+validity.
 
 ## Conceptual overview ##
 
@@ -27,13 +31,14 @@ keys for authenticating to a server (known as
 "`PubkeyAuthentication`"), rather than relying on a password exchange.
 But again, the public part of the key needs to be transmitted to the
 server through a secure out-of-band channel (usually via a separate
-password-based SSH connection) in order for this type of
-authentication to work
+password-based SSH connection or a (hopefully signed) e-mail to the
+system administrator) in order for this type of authentication to
+work.
 
 [OpenSSH](http://openssh.com/) currently provides a functional way to
-managing the RSA and DSA keys required for these interactions through
-the `known_hosts` and `authorized_keys` files.  However, it lacks
-any type of [Public Key Infrastructure
+manage the RSA and DSA keys required for these interactions through
+the `known_hosts` and `authorized_keys` files.  However, it lacks any
+type of [Public Key Infrastructure
 (PKI)](http://en.wikipedia.org/wiki/Public_Key_Infrastructure) that
 can verify that the keys being used really are the one required or
 expected.