X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=index.mdwn;h=ec381705102ef17a2fb89564088902bb3d5d936f;hb=ed1a219c82539da3768812731786d6b34e0ec3d5;hp=d2b02f5b5c8a49f543e1367f3a7aa8d2fef8f3f1;hpb=8ac9d484a5bacbde77ea380e2eaac0d3c5a89e78;p=notmuch-wiki

diff --git a/index.mdwn b/index.mdwn
index d2b02f5..ec38170 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,4 @@
+[[!img notmuch-logo.png alt="Notmuch logo" class="left"]]
 # Why Notmuch?
 
 * "Not much mail" is what Notmuch thinks about your email
@@ -41,6 +42,19 @@ would love a good library interface for fast, global search with
 support for arbitrary tags, then Notmuch also may be exactly what
 you've been looking for.
 
+## Documentation
+
+So far, there is not much documentation.  Eventually, the wiki will
+contain a reference for users.  This is what we have so far:
+
+* [Initial Tagging](/initial_tagging)
+* [Emacstips](/emacstips)
+
+Apart from the wiki, help is available via email.  Join the mailing
+list.  Read the archives.  Ask questions.
+
+## Source code
+
 Either way, please feel free to jump in. All of the code for Notmuch
 is available as <a
 href="http://www.fsf.org/licensing/essays/free-sw.html">free
@@ -51,12 +65,12 @@ can be checked out via git with this command:
 
 	git clone git://notmuchmail.org/git/notmuch
 
-Or you can browse the <a
+You can browse the <a
 href="http://git.notmuchmail.org/git/notmuch">Notmuch code history</a>
 online. And finally, you can <a
 href="http://notmuchmail.org/mailman/listinfo/notmuch-commits">subscribe
 to the notmuch-commits list</a> to watch every commit made to notmuch
-(and to the notmuchmail.org web site).
+and the notmuchmail.org web site.
 
 Patches are most welcome and should be sent to notmuch&#64;notmuchmail.org.
 Please try to follow the [patch submission guidelines of the Git
@@ -65,19 +79,29 @@ when submitting patches to notmuch. We are currently test-driving a [Patchwork
 instance](http://patchwork.notmuchmail.org/project/notmuch) to help us keep track
 of [the patches](http://patchwork.notmuchmail.org/project/notmuch/list).
 
+## Contact: Email & IRC
+
 Comments? Please feel free to email the notmuch mailing list:
 notmuch&#64;notmuchmail.org (subscription is not required, but you can
-<a href="http://notmuchmail.org/mailman/listinfo/notmuch">subscribe to
-the notmuch list</a> if you would like to). You can also browse the
+subscribe to the [notmuch list](http://notmuchmail.org/mailman/listinfo/notmuch) if you would like to). You can also browse the
 <a href="http://notmuchmail.org/pipermail/notmuch/">online archives</a>
-or the mailing list or download an <a href="http://notmuchmail.org/archives/notmuch.mbox">mbox file</a>
-of the entire mailing-list. The mb2md utility can then be used to
-convert the archives to maildir format which is convenient for
-reading the archives within notmuch itself.
+of the mailing list, read them as a <a href="http://n3.nabble.com/notmuch-f198994.html">web forum (nabble)</a>, or download a <a href="http://notmuchmail.org/archives/notmuch.mbox">mbox file</a> of the entire mailing-list. 
 
-### Website
+The mb2md utility can be used to convert the archives to maildir format which is convenient for reading the archives within notmuch itself.
 
-This wiki is maintained using [ikiwiki](http://ikiwiki.info). You can pull and
-push changes using the following URL (no authentication necessary):
+If you prefer real-time chat, there is often someone on the [#notmuch](irc://chat.freenode.net/#notmuch)@irc.freenode.net IRC channel.
+
+## Feature ideas - bin list
+
+We have started a <a href="http://notmuchmail.org/feature-requests/">feature requests</a> page on this wiki. 
+No, things you add there won't automatically get implemented - but it's a nice way to collect ideas.
+
+## Emacs Tips and Tricks
+
+The best supported interface to notmuch is based on emacs and can be tweaked extensively. We have started to collect some tips and tricks [here](/emacstips).
+
+### Website
 
-    git://notmuchmail.org/git/notmuch-wiki
+This wiki is maintained using
+[ikiwiki](http://ikiwiki.info). Instructions on how to edit it can be
+found [here](/wikiwriteaccess).
\ No newline at end of file