6 files changed, 38 insertions, 19 deletions
diff --git a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
index 85f79f1..0630cc4 100644
--- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
+++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
@@ -4,14 +4,14 @@ Currently, monkeysphere-ssh-proxycommand checks the following places to
 determine which keyserver to use (in order of priority):
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * default value of subkeys.pgp.net
 
 It would be useful if monkeysphere also consulted ~/.gnupg/gpg.conf, using the
 following order instead:
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * keyserver variable in ~/.gnupg/gpg.conf
  * default value of subkeys.pgp.net
 
diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn
index 5b05759..65fa893 100644
--- a/website/bugs/setup-test-server-for-public.mdwn
+++ b/website/bugs/setup-test-server-for-public.mdwn
@@ -63,7 +63,7 @@ I envision a script you'd invoke like:
 	root@george# addmsuser foo 'Foo T. Bar <foo@example.org>'
 
 Which would create the `foo` account, populate
-`~foo/.config/monkeysphere/authorized_user_ids`, make a note in a log
+`~foo/.monkeysphere/authorized_user_ids`, make a note in a log
 someplace, and send a welcome letter.
 
 --dkg
diff --git a/website/doc.mdwn b/website/doc.mdwn
index 997c34d..18b48a2 100644
--- a/website/doc.mdwn
+++ b/website/doc.mdwn
@@ -10,8 +10,10 @@ Monkeysphere relies on:
 
 ## Getting started ##
 
+ * [Downloading and installing](/download)
  * Getting started as a [user](/getting-started-user)
  * Getting started as a [server admin](/getting-started-admin)
+ * [Developing the monkeysphere](/community)
 
 ## References ##
 
diff --git a/website/getting-started-admin.mdwn b/website/getting-started-admin.mdwn
index 69f498a..0c4fe85 100644
--- a/website/getting-started-admin.mdwn
+++ b/website/getting-started-admin.mdwn
@@ -57,7 +57,7 @@ users with the Monkeysphere.
 For each user account on the server, the userids of people authorized
 to log into that account would be placed in:
 
-	~/.config/monkeysphere/authorized_user_ids
+	~/.monkeysphere/authorized_user_ids
 
 However, in order for users to become authenticated, the server must
 determine that the user IDs on their keys have "full" validity.  This
diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index 3f7b689..00b803e 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -120,7 +120,7 @@ update-authorized_keys command:
 	$ monkeysphere update-authorized_keys
 
 This command will take all the user IDs listed in the
-`~/.config/monkeysphere/authorized_user_ids` file and check to see if
+`~/.monkeysphere/authorized_user_ids` file and check to see if
 there are acceptable keys for those user IDs available.  If so, they
 will be added to the `~/.ssh/authorized_keys` file.
 
diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn
index feee9bd..44f50d9 100644
--- a/website/mirrors.mdwn
+++ b/website/mirrors.mdwn
@@ -8,9 +8,7 @@ We're mirrored on several servers. Rather than using ikiwiki's [pinger/pingee
 approach to distribution](http://ikiwiki.info/tips/distributed_wikis/), we've
 opted for a method that uses ssh.
 
-The steps for creating a new mirror are:
-
-## Steps to take on the mirror server ##
+## Initial steps to take on the mirror server ##
 
 Add etch-backports to your /etc/apt/sources.list:
 
@@ -50,19 +48,12 @@ Add web site configuration that the user has write access to. If you are using A
 
 Upload and edit ikiwiki.setup.sample from the docs directory
 
-As the new user, create two new git repos
-
-    mkdir monkeysphere.git; cd monkeysphere.git; git init --bare; cd ../
-    git clone monkeysphere.git # this will create a second git repo called monkeysphere
-
-Change the mode of monkeysphere.git/hooks/post-receive to 755
+As the new user, create a git repo
 
-    chmod 755 monkesphere.git/hooks/post-receive
+    mkdir monkeysphere.git; cd monkeysphere.git; git init --bare;
 
-Edit the file so that it executes the post-receive hook ikiwiki generates (as
-you specified in the ikiwiki.setup file)
 
-## Admin steps to take to enable the configuration ##
+## Initial Admin steps to take to enable the configuration ##
 
 Add a new dns record for SERVERNAME.monkeysphere.info. 
 
@@ -73,9 +64,35 @@ Add the new server as a remote on webmaster@george.riseup.net:monkeysphere.git
     cd ~/monkeysphere.git
     git add remote SERVERNAME USER@SERVERNAME.monkeysphere.info:/path/to/repo
 
+Modify ~/monkeysphere.git/config, so the new repo stanza looks like this:
+
+    [remote "SERVERNAME"]
+		url = USER@SERVERNAME.monkeysphere.info:monkeysphere.git
+		push = +refs/heads/master
+		skipDefaultUpdate = true
+
 Test:
 
     git push SERVERNAME
 
 
-    
+## Final steps to take on mirror server ##
+
+At this point, you should have a populated git repo in your
+monkeyshere.git directory. 
+
+Change the mode of monkeysphere.git/hooks/post-receive to 755
+
+    chmod 755 monkesphere.git/hooks/post-receive
+
+Edit the file so that it executes the post-receive hook ikiwiki generates (as
+you specified in the ikiwiki.setup file)
+
+Next, clone the repository:
+
+    clone monkeysphere.git monkeysphere
+
+And lastly, run ikiwiki manually to generate the post-receive hook:
+
+    ikiwiki --setup ikiwiki.setup
+