X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=nmbug.mdwn;h=61ee9ccc59c0dea4af44e35d134924808efbc584;hb=e7faa970c4d8cd18f3e7712b20ee7d84366aea4d;hp=5b66e468507131ed7c0e393742f4dcaeb5c86257;hpb=bdb4c3bd6c7be4fd1d83f6346c789061a5e92417;p=notmuch-wiki

diff --git a/nmbug.mdwn b/nmbug.mdwn
index 5b66e46..61ee9cc 100644
--- a/nmbug.mdwn
+++ b/nmbug.mdwn
@@ -85,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.
 
@@ -109,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
@@ -144,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