Merge commit 'dkg/master'

Conflicts:

	website/doc.mdwn
	website/templates/nav.mdwn

1 files changed, 5 insertions, 5 deletions

diff --git a/website/download.mdwn b/website/download.mdwn
index b848e2a..69048c9 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -8,8 +8,8 @@ by following these directions:
 You can add this repo to your system by putting the following lines in
 /etc/apt/sources.list.d/monkeysphere.list:
 
-	deb http://monkeysphere.info/debian experimental monkeysphere
-	deb-src http://monkeysphere.info/debian experimental monkeysphere
+	deb http://archive.monkeysphere.info/debian experimental monkeysphere
+	deb-src http://archive.monkeysphere.info/debian experimental monkeysphere
 
 The repository is currently signed by [Daniel Kahn Gillmor's OpenPGP
 key](http://fifthhorseman.net/dkg.gpg "dkg's key"), key id D21739E9
@@ -23,7 +23,7 @@ Once you've installed the packages, you might want to read up on how
 to get started [as a regular user](/getting-started-user), or [as a
 systems administrator](/getting-started-admin).
 
-### Enhancements ###
+## Enhancements ##
 
 As of 2008-08-22, If you run debian lenny you're very close to being
 able to run a fully monkeysphere-enabled system.  One gap in the
@@ -34,7 +34,7 @@ You can install a patched version of GnuTLS to enable this feature of
 the MonkeySphere by adjusting the monkeysphere `sources.list` lines to
 include the `gnutls` component.  So they'd look like this instead:
 
-	deb http://monkeysphere.info/debian experimental monkeysphere gnutls
-	deb-src http://monkeysphere.info/debian experimental monkeysphere gnutls
+	deb http://archive.monkeysphere.info/debian experimental monkeysphere gnutls
+	deb-src http://archive.monkeysphere.info/debian experimental monkeysphere gnutls
 
 You can [read more about this offering](/news/modified-gnutls-2.4.x-available).