From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 2 Sep 2008 03:57:50 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.12-1~33
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0e5a29df930f53cacfb7526b166ca1c6d4fbd25a;hp=01f9a4498573ab1c0a80bcad5240e7612f25a881;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/website/community.mdwn b/website/community.mdwn
index f2c5fc7..477eb45 100644
--- a/website/community.mdwn
+++ b/website/community.mdwn
@@ -38,7 +38,7 @@ offering:
 
 	git clone git://lair.fifthhorseman.net/~jrollins/monkeysphere
 
-Micah Anderson
+Micah Anderson:
 	
 	git clone git://labs.riseup.net/~micah/monkeysphere
  
diff --git a/website/download.mdwn b/website/download.mdwn
index b503c03..b848e2a 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -20,7 +20,7 @@ configuration](http://cmrg.fifthhorseman.net/wiki/apt/importing-keys
 "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 ###
diff --git a/website/templates/nav.mdwn b/website/templates/nav.mdwn
index d6b4212..a4bcebf 100644
--- a/website/templates/nav.mdwn
+++ b/website/templates/nav.mdwn
@@ -1,3 +1,3 @@
-[[overview|index]] | [[why?|why]] | [[download]] | [[documentation|doc]] | [[news]] | [[community]] | [[bugs]]
+[[overview|/index]] | [[why?|/why]] | [[/download]] | [[documentation|/doc]] | [[/news]] | [[/community]] | [[/bugs]]
 
 ----