cleanup initial tagging page

diff --git a/initial_tagging.mdwn b/initial_tagging.mdwn
index 1e0fcc1824623e5325badc5a44349035d8c5c163..81bfd06e8ad98782205676d472890bc40d539afa 100644 (file)
--- a/initial_tagging.mdwn
+++ b/initial_tagging.mdwn
@@ -19,10 +19,10 @@ following:
     notmuch tag -new -- tag:new and from:me@example.com
 
     # delete all messages from a spammer:
-    notmuch tag +deleted -- from:spam@spam.com
+    notmuch tag +deleted -- tag:new and from:spam@spam.com
 
     # tag all message from notmuch mailing list
-    notmuch tag +notmuch -- to:notmuch@notmuchmail.org
+    notmuch tag +notmuch -- tag:new and to:notmuch@notmuchmail.org
 
     # finally, retag all "new" messages "inbox" and "unread"
     notmuch tag +inbox +unread -new -- tag:new
@@ -36,30 +36,26 @@ to do post-processing. See `man notmuch-hooks` for details on hooks.
 
 # Other solutions
 
-* [This
-  email](http://notmuchmail.org/pipermail/notmuch/2010/001691.html)
-  (and related thread) details Carl Worth's approach to tagging. It is
-  email id:87r5o8stbj.fsf@yoom.home.cworth.org in the notmuch mailing
-  list archives.
-
-
-* [This
-  email](http://notmuchmail.org/pipermail/notmuch/2010/001690.html)
-  (and related thread) details one user's setup, which includes using
-  the inbox tag as a "new mail" flag. It is email
-  id:87hbp5j9dv.fsf@hackervisions.org in the notmuch mailing list
-  archives.
-
-* [This email](http://notmuchmail.org/pipermail/notmuch/2011/003976.html)
-  details another user's setup, which uses a dedicated tag for marking new mail,
-  which is then sorted with a python script using Bogofilter for spam detection.
-  This is generally a great deal faster than a shell-scripted approach.
-  This approach introduces a workflow built around a "watch" tag. Here, the user
-  is only presented with threads as they are started. At this point the user can
-  choose to watch the thread, in which case future messages will be tagged with
-  "inbox", or ignore it. This provides an excellent means for dealing with a
-  large flux of messages with a low signal-to-noise.  It is email
-  id:"87tyfu3k5a.fsf@gmail.com" in the notmuch mailing list archives.
+* [Carl Worth's approach to tagging](http://notmuchmail.org/pipermail/notmuch/2010/001691.html). It
+  is email id:87r5o8stbj.fsf@yoom.home.cworth.org in the notmuch
+  mailing list archives.
+
+
+* [One user's setup](http://notmuchmail.org/pipermail/notmuch/2010/001690.html)
+  (id:87hbp5j9dv.fsf@hackervisions.org), which includes using the
+  inbox tag as a "new mail" flag.
+
+* [Another user's setup](http://notmuchmail.org/pipermail/notmuch/2011/003976.html)
+  (id:"87tyfu3k5a.fsf@gmail.com"), which uses a dedicated tag for
+  marking new mail, which is then sorted with a python script using
+  Bogofilter for spam detection.  This is generally a great deal
+  faster than a shell-scripted approach.  This approach introduces a
+  workflow built around a "watch" tag. Here, the user is only
+  presented with threads as they are started. At this point the user
+  can choose to watch the thread, in which case future messages will
+  be tagged with "inbox", or ignore it. This provides an excellent
+  means for dealing with a large flux of messages with a low
+  signal-to-noise.
 
 * [afew](https://github.com/teythoon/afew) is an initial tagging
   solution that should work out of the box for most basic tagging