X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=index.mdwn;h=c2160268a67c143ef39611473633d4e86ace7a1d;hb=HEAD;hp=d080b7a176cd440d96fa4f504108b51f3280d7a1;hpb=9ca6470858ee4387ccaabe3ede5995d84b0c6975;p=obsolete%2Fnotmuch-wiki

diff --git a/index.mdwn b/index.mdwn
index d080b7a..c216026 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -70,11 +70,11 @@ below).  Join the mailing list.  Read the archives.  Ask questions.
 
 Notmuch ships with a powerful set of [[command-line tools|manpages]], an
 [[email client for Emacs|emacstips]], another
-[client for vim](http://git.notmuchmail.org/git/notmuch/blob/HEAD:/vim/README),
+[client for vim](http://git.notmuchmail.org/git/notmuch/blob/HEAD:/contrib/notmuch-vim/README),
 and a [[Mutt integration script|notmuch-mutt]].
 
 There are also many other [[email clients and frontends|frontends]] based on
-Notmuch.
+Notmuch. And a few tips about integrating it with [[Mutt|mutttips]] and [[Vim|vimtips]].
 
 ## Screenshots
 
@@ -95,7 +95,7 @@ Notmuch is packaged for the following distributions:
 * [Slackware](http://slackbuilds.org/repository/13.37/office/notmuch/)
 * [Ubuntu](http://packages.ubuntu.com/search?keywords=notmuch)
 
-## Development
+## Development and Contributing
 
 All of the code for Notmuch is available as [free
 software](http://www.fsf.org/licensing/essays/free-sw.html) released
@@ -116,18 +116,19 @@ We have a [buildbot](http://buildbot.notmuchmail.org/grid) (here's
 its
 [configuration](https://github.com/tomprince/buildbot-configs/tree/notmuch)).
 
-## Bug-tracking and patches
+Contributions, such as patches, to Notmuch are most welcome. Please refer to the
+[[guide to contributing|contributing]].
 
-Patches are most welcome and should be sent to notmuch@notmuchmail.org.
-Please try to follow the [[patch submission guidelines|patchformatting]]
-when submitting patches.
+## Bug and patch tracking
 
 The tagging and filtering features of notmuch make it quite suitable
 for use as a bug- and patch-tracker. We are currently experimenting
 with using it for this purpose for notmuch development, using a
-utility called [[nmbug]].  The status of current patches can also be
+utility called [[nmbug]]. The status of bugs and current patches can also be
 followed [online](http://nmbug.tethera.net/status).
 
+Bug reports should be sent to the Notmuch mailing list notmuch@notmuchmail.org.
+
 ## Contact: Email & IRC
 
 Comments? Please feel free to email the notmuch mailing list:
@@ -151,9 +152,10 @@ channel.
 
 ## Feature ideas
 
-We have started a [[feature requests|feature-requests]] page on this
-wiki.  No, things you add there won't automatically get implemented -
-but it's a nice way to collect ideas.
+If you have a feature idea/request, please send it to the
+[mailing list](http://notmuchmail.org/mailman/listinfo/notmuch). You
+don't have to be subscribed to send, although there might be a delay
+for non-subscribers.
 
 ## Website