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

[notmuch-wiki] / nmbug.mdwn

diff --git a/nmbug.mdwn b/nmbug.mdwn
index 9f809eee1b89c48801238444eeb14cb8c9b78407..6431ee9c68397c5c515bba43af5aec633687cac7 100644 (file)
--- 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,8 +110,8 @@ 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)                                                        
+    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
@@ -124,6 +125,7 @@ things that "everyone" agrees should be fixed.
 
 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
@@ -147,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