Merge commit 'dkg/master'

diff --combined website/download.mdwn
index be260056e4343b068dba7e7368abca3b384f9b94,b503c03a7615acbbff9880d521289a6d454e1401..b848e2a66597132d68c50c3911a9ec55177d9076
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -20,7 -20,7 +20,7 @@@ configuration](http://cmrg.fifthhorsema
  "Instructions for adding dkg's key to apt")
  
  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
 +to get started [as a regular user](/getting-started-user), or [as a
  systems administrator](/getting-started-admin).
  
  ### Enhancements ###
@@@ -37,4 -37,4 +37,4 @@@ include the `gnutls` component.  So the
        deb http://monkeysphere.info/debian experimental monkeysphere gnutls
        deb-src http://monkeysphere.info/debian experimental monkeysphere gnutls
  
- You can [read more about this offering](/news/modified-gnutls-2.4.x-available.mdwn).
+ You can [read more about this offering](/news/modified-gnutls-2.4.x-available).