4 files changed, 12 insertions, 7 deletions
diff --git a/doc/announcement.html b/doc/announcement.html
index 1787142..68607ac 100644
--- a/doc/announcement.html
+++ b/doc/announcement.html
@@ -30,8 +30,8 @@ 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>
 
diff --git a/doc/george/changelog b/doc/george/changelog
index 5c2f010..8b03a7f 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -12,6 +12,8 @@
 	  with ikiwiki updates
 	* moved apt repository over to http://archive.monkeysphere.info/
 	* aptitude update && aptitude dist-upgrade
+	* canonicalizing hostname for normal web access to
+	  http://web.monkeysphere.info
 	
 2008-08-26 - dkg
 	* aptitude update && aptitude full-upgrade
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 4c8ecdc..2966f7c 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -469,7 +469,7 @@ revoke_hostname() {
     echo "WARNING: There is a known bug in this function."
     echo "This function has been known to occasionally revoke the wrong user ID."
     echo "Please see the following bug report for more information:"
-    echo "http://monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
+    echo "http://web.monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
     read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
     if [ ${OK/y/Y} != 'Y' ] ; then
 	failure "aborting."
diff --git a/website/bugs/add-man-pages-to-website.mdwn b/website/bugs/add-man-pages-to-website.mdwn
index 4a8d2e2..399438a 100644
--- a/website/bugs/add-man-pages-to-website.mdwn
+++ b/website/bugs/add-man-pages-to-website.mdwn
@@ -1,7 +1,7 @@
 [[meta title="Add man pages to web site"]]
 
 We should publish the various monkeysphere man pages in browsable form
-somewhere under http://monkeysphere.info/.  Ideally, this would be
+somewhere under http://web.monkeysphere.info/.  Ideally, this would be
 updated automatically from the sources for the official man pages
 themselves.