Merge commit 'dkg/master'

[monkeysphere.git] / doc / announcement.html

diff --git a/doc/announcement.html b/doc/announcement.html
index 489dae595f2ada50fba35db7fc6de7243ab98354..68607ac9d00ecb012fb0dd914323d49e3e0527d1 100644 (file)
--- a/doc/announcement.html
+++ b/doc/announcement.html
@@ -24,14 +24,14 @@ log into every single machine?</p>
 <p>Do you administer servers, and wish you could re-key them without
 sowing massive pain and confusion among your users (or worse,
 encouraging bad security habits among them)?  Do you wish you could
-identify the users to grant access by name, instead of by opaque
-string?  Do you wish you could rapidly grant or revoke access to a
-user across a group of machines by enabling or disabling
-authentication for that user?</p>
+grant access to your users by name, instead of by opaque string?  Do
+you wish you could rapidly revoke access to a user (or compromised
+key) across a group of machines by disabling authentication for that
+user?</p>
 
 <p>A group of us have been working on a public key infrastructure for
-SSH. <a href="http://monkeysphere.info">Monkeysphere</a> makes use of
-the existing OpenPGP web-of-trust to fetch and cryptographically
+SSH. <a href="http://web.monkeysphere.info">Monkeysphere</a> makes use
+of the existing OpenPGP web-of-trust to fetch and cryptographically
 validate (and revoke!) keys.  This works in either directions: both
 <code>authorized_keys</code> <em>and</em> <code>known_hosts</code> are
 handled.  Monkeysphere gives users and admins tools to deal with SSH
@@ -39,14 +39,17 @@ keys by thinking about the people and machines to whom the keys
 belong, instead of requiring humans to do tedious (and error-prone)
 manual key verification.</p>
 
-<p>We have <a href="http://monkeysphere.info/download">debian packages
+<p>We have <a href="http://web.monkeysphere.info/download">debian packages
 available</a> which should install against lenny, <a
 href="https://lists.riseup.net/www/info/monkeysphere">a mailing
 list</a>, and open ears for good questions, suggestions and
 criticism.</p>
 
-<p>If you have a chance to give it a try (<a href="???">as a user</a>
-or <a href="???">as an admin</a>), it would be great to <a
+<p>If you have a chance to give it a try (<a
+href="http://web.monkeysphere.info/getting-started-user/">as a
+user</a> or <a
+href="http://web.monkeysphere.info/getting-started-admin/">as an
+admin</a>), it would be great to <a
 href="https://lists.riseup.net/www/info/monkeysphere">get
 feedback</a>.</p>