Expand the contact page

1 files changed, 53 insertions, 12 deletions

diff --git a/contact.mdwn b/contact.mdwn
index 21cc24c..3db43f8 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,16 +1,57 @@
-Contact
--------
-
-* [Mailing list](http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-support-obnam.org)
-* `#obnam` on `irc.oftc.net` for IRC discussions about Obnam
-    - the mailing list is strongly preferred for asking help with Obnam
-    - Lars rarely has time to discuss anything serious on IRC
-    - patches to the mailing list only; post them as patches, not pointers to
-      code on some website, though an additional pointer to a branch
-      that can be merged is fine
+[[!meta title="Contact"]]
+
+E-mail
+======
+
+* If you have any questions about Obnam, or any problems when using
+  it, e-mail the [support list][].
+* If you have made improvements to Obnam, or want to discuss ways in
+  which you can implement them, please e-mail the
+  [development list][].
+* If unsure which list is appropriate, use the support list.
+* The [announcement list][] is used by Obnam developers to announce
+  new releases, or to alert Obnam users about anything that they need
+  to know about. If you're using Obnam, you probably should be
+  subscribed to this list. It is very low volume.
+
+Please don't e-mail developers directly, unless you know them.
+
+[support list]: http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-support-obnam.org
+[development list]: http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org
+[announcement list]: http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-announce-obnam.org
+
+IRC
+===
+
+The `#obnam` channel on the  `irc.oftc.net` IRC network exists for
+realtime discussions about Obnam. Note that the [support list][] is
+strongly preferred over the IRC channel for support issues, but you're
+welcome to hang out and chat if you want.
+
+Note that the main Obnam developer, Lars Wirzenius, rarely has time
+for serious discussions on IRC, especially during working hours.
+
+Patches and fixes and new features
+==================================
+
+If you want to make changes to Obnam, or this website, please clone
+the git repository and send patches to the [development list][],
+preferably using `git format-patch --cover-letter`.
+
+For learning to use git, start with these pages:
+
+* [Basics of version control systems][] on Yakking.
+* [Git tutorial][]
+
+[Basics of version control systems]: http://yakking.branchable.com/posts/basics-of-cs/
+[Git tutorial]: http://www.git-scm.com/book/en/Getting-Started
+
+
+More information
+================
+
 * [Lars's blog posts about Obnam](http://blog.liw.fi/tag/obnam/)
-  and [btree](http://blog.liw.fi/tag/btree/).
+  and [larch](http://blog.liw.fi/tag/larch/).
 * Also, [Lars's private journal entries](http://liw.fi/obnam/journal-dump/) 
   about obnam and btree.
 * [Sharon Kimble's blog posts about Obnam](http://www.sharons.org.uk/tag/obnam/)
-* If all else fails, [[/contact]] gives contact information for Lars.