Merge branch 'master' of webmaster@george.riseup.net:monkeysphere

diff --git a/website/community.mdwn b/website/community.mdwn
new file mode 100644 (file)
index 0000000..095581d
--- /dev/null
+++ b/website/community.mdwn
@@ -0,0 +1,13 @@
+[[meta title="Monkeysphere community"]]
+
+# Mailing list #
+
+The Monkeysphere project is a new project with just one mailing list
+at the moment. Its where we roll our sphere, discuss development
+issues, the project, and various complicated conundrums involving
+subjects around the web of trust.
+
+[Join us](https://lists.riseup.net/www/info/monkeysphere), we're a
+friendly bunch. You can also [look through our
+archives](https://lists.riseup.net/www/arc/monkeysphere) if you don't
+believe me.

diff --git a/website/download.mdwn b/website/download.mdwn
index 3c2f3c54fda59bb0349a312c800e9bcbb9c2afbc..dbae3094f0ad8851a17b1c556e4dcac9b5b1af19 100644 (file)
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -34,6 +34,10 @@ The git repo from this web site:
 
        git clone git://lair.fifthhorseman.net/~dkg/monkeysphere monkeysphere
 
+[Micah Anderson]
+       
+       git clone git://labs.riseup.net/~micah/monkeysphere
+
 ## Contact ##
 
 Please feel free to contact any of the Monkeysphere developers with

diff --git a/website/index.mdwn b/website/index.mdwn
index 6583e186a666387ddc17371ee9ebaf202cc804aa..606456955f29f32ba443d4169bdca79a75e63bb7 100644 (file)
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -9,7 +9,7 @@ yourself and the servers you administer or connect to.  OpenPGP keys
 are tracked via GnuPG, and managed in the `known_hosts` and
 `authorized_keys` files used by OpenSSH for connection authentication.
 
-[why?](/why) | [[bugs]] | [[download]] | [[news]] | [[documentation|doc]]
+[why?](/why) | [[news]] | [[download]] | [[documentation|doc]] | [[community]] | [[bugs]]
 
 ## Conceptual overview ##