Merge branch 'master' of git://notmuchmail.org/git/notmuch-wiki

[notmuch-wiki] / nmbug.mdwn

diff --git a/nmbug.mdwn b/nmbug.mdwn
index 6bc04c863882a74bf56f9aa3d358507d9f6a8f19..6431ee9c68397c5c515bba43af5aec633687cac7 100644 (file)
--- a/nmbug.mdwn
+++ b/nmbug.mdwn
@@ -6,7 +6,8 @@ There is a dump of (some views of) the nmbug [[status|http://nmbug.tethera.net/s
 
 ## Getting started
 
-1. Install and use notmuch version notmuch 0.9+63~gebd1adc or newer.
+1. Install and use notmuch version notmuch 0.9+63~gebd1adc or newer and
+   perl module `Pod::Usage` (packaged as `perl-doc` in debian).
 
    The nmbug script is available in `contrib/nmbug`.
 
@@ -67,11 +68,11 @@ For the moment, we are using a central repo, hosted at:
 To get push access, send your public key (ideally in a gpg signed
 email) to David Bremner.  There is a convenience command:
 
-    nmbug push
+    $ nmbug push
 
 But you will have to change your url with:
 
-    git --git-dir=$HOME/.nmbug remote set-url origin nmbug@nmbug.tethera.net:nmbug-tags
+    $ git --git-dir=$HOME/.nmbug remote set-url origin nmbug@nmbug.tethera.net:nmbug-tags
 
 ## Tagging conventions
 
@@ -84,7 +85,8 @@ Initially any patch should be tagged:
 
     notmuch::patch
 
-Patches that are for discussion, rather than proposed for master should be tagged:
+Patches that are for discussion, rather than proposed for master
+should also be tagged:
 
     notmuch::wip                is "work in progress", posted for review or comment.
 
@@ -108,18 +110,22 @@ Sometimes the process stalls, and patches get tagged:
 
     notmuch::moreinfo           waiting for feedback from patch proposer
                                 or others
-
+    notmuch::stale              The patch no longer applies to master (or in
+                                rare cases, to release)
 ### Bug tracking tag
 
 So far we are just tagging certain messages as bug reports, meaning
 things that "everyone" agrees should be fixed.
 
     notmuch::bug                is a bug report
+    notmuch::fixed              indicates that the bug is fixed in the
+                                master branch
 
 ### Optional tags
 
 These patches are more comments and suggestions.
 
+    notmuch::doc                is a documentation patch
     notmuch::emacs              is a patch/bug for the emacs UI
     notmuch::feature            provides a new feature
     notmuch::fix                fixes a bug
@@ -143,6 +149,9 @@ search is:
 
     tag:notmuch::reviewed and not tag:notmuch::pushed
 
+See the [[status|http://nmbug.tethera.net/status]] page for more
+example searches.
+
 ## Design notes
 
 ### Disk format