Merge commit 'dkg/master'

Conflicts:

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

3 files changed, 19 insertions, 2 deletions

diff --git a/website/news/apt-repo-moved.mdwn b/website/news/apt-repo-moved.mdwn
new file mode 100644
index 0000000..8f0bf81
--- /dev/null
+++ b/website/news/apt-repo-moved.mdwn
@@ -0,0 +1,8 @@
+[[meta title="APT repository moved"]]
+
+The monkeysphere APT repository has been moved from
+`http://monkeysphere.info/debian` to
+`http://archive.monkeysphere.info/debian`.  You'll probably want to
+update your `sources.list` to match the [official lines](/download).
+
+Apologies for any confusion or hassle this causes!
diff --git a/website/news/git-repo-moved.mdwn b/website/news/git-repo-moved.mdwn
new file mode 100644
index 0000000..c2755d1
--- /dev/null
+++ b/website/news/git-repo-moved.mdwn
@@ -0,0 +1,9 @@
+[[meta title="git repository moved"]]
+
+The monkeysphere git repository has been moved from
+`git://monkeysphere.info/monkeysphere` to
+`git://git.monkeysphere.info/monkeysphere`.  You'll probably want to
+update your `.git/config` to match the [official clone
+target](/community).
+
+Apologies for any confusion or hassle this causes!
diff --git a/website/news/modified-gnutls-2.4.x-available.mdwn b/website/news/modified-gnutls-2.4.x-available.mdwn
index b3db308..44e08d0 100644
--- a/website/news/modified-gnutls-2.4.x-available.mdwn
+++ b/website/news/modified-gnutls-2.4.x-available.mdwn
@@ -9,8 +9,8 @@ circumstances.
 You can track this package in debian lenny by adding the following
 lines to `/etc/apt/sources.list`:
 
-	deb http://monkeysphere.info/debian experimental gnutls
-	deb-src http://monkeysphere.info/debian experimental gnutls
+	deb http://archive.monkeysphere.info/debian experimental gnutls
+	deb-src http://archive.monkeysphere.info/debian experimental gnutls
 
 Or you can patch and build the packages yourself with the patches and
 scripts provided in [the MonkeySphere git repo](/download).