Merge commit 'dkg/master'

Conflicts:

	website/download.mdwn

diff --cc website/download.mdwn
index 384a03c09487a6ead73c07c05b5df0f3f3840699,1f27fde4508ce58d252a5089549b68de0e34256e..1a0f26e1d2cacd164beea398d81bb46b130e83a9
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -28,17 -13,19 +28,16 @@@ You can add this repo to your system b
        deb http://archive.monkeysphere.info/debian experimental monkeysphere
        deb-src http://archive.monkeysphere.info/debian experimental monkeysphere
  
 -The repository is currently signed by the Monkeysphere archive
 -signing key, key id EB8AF314 (fingerprint: `2E8D
 -D26C 53F1 197D DF40 3E61 18E6 67F1 EB8A F314`).  To cryptographically
 +The repository is currently signed by [The Monkeysphere archive
 +signing key](/archive-key), key id EB8AF314 (fingerprint: `2E8D D26C
 +53F1 197D DF40 3E61 18E6 67F1 EB8A F314`).  To cryptographically
  verify the packages, you'll want to [add this key to your apt
- configuration after verifying its
- integrity](http://wiki.debian.org/SecureApt).
+ configuration after verifying its integrity](/archive-key).
  
  To use the `monkeysphere subkey-to-ssh-agent` subcommand, you will
 -also need [version 2.6 of GnuTLS](/news/gnutls-2.6-enables-monkeysphere),
 -which is available in Debian experimental.
 -
 -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).
 +also need [version 2.6 of
 +GnuTLS](/news/gnutls-2.6-enables-monkeysphere), which is available in
 +Debian experimental.
  
  ## FreeBSD ##