From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 2 Sep 2008 06:08:58 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.12-1~31
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=948b21702fbeaf1874286bd9b0d7c27c37d55c2a

Merge commit 'dkg/master'

Conflicts:

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

948b21702fbeaf1874286bd9b0d7c27c37d55c2a
diff --cc website/doc.mdwn
index 0b65aed,e3f8854..634afd9
--- a/website/doc.mdwn
+++ b/website/doc.mdwn
@@@ -1,7 -1,6 +1,7 @@@
  [[!template id="nav"]]
  [[meta title="Documentation"]]
 +
- # Dependencies #
+ ## Dependencies ##
  
  Monkeysphere relies on:
  
diff --cc website/download.mdwn
index b848e2a,b64711d..69048c9
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@@ -20,10 -20,10 +20,10 @@@ 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 ###
+ ## 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