Merge tag '0.12_rc2'

notmuch 0.12~rc2 release

diff --combined man/man1/notmuch-config.1
index d22988a7f9e5c09950c29d6fe87b73ecdff13a06,fb023b8c2ceaabc0fb15e51b47972d9c858ddf06..a8c17d811575c77c62318ac825690c6f486de5e0
--- 1/man/man1/notmuch-config.1
--- 2/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-CONFIG 1 2012-02-29 "Notmuch 0.12~rc1"
+ .TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2"
  .SH NAME
  notmuch-config \- Access notmuch configuration file.
  .SH SYNOPSIS
@@@ -83,14 -83,6 +83,14 @@@ will be ignored, regardless of the loca
  directory hierarchy.
  .RE
  
 +.RS 4
 +.TP 4
 +.B search.exclude_tags
 +A list of tags that will be excluded from search results by
 +default. Using an excluded tag in a query will override that
 +exclusion.
 +.RE
 +
  .RS 4
  .TP 4
  .B maildir.synchronize_flags

diff --combined man/man1/notmuch-count.1
index f593065a6038bd004f9660a67d445bd7bcba1b1a,383252e34472047eae733f6108949fcef5d49e6b..302a7fa7152db6b8f25e05a04fae2fea855896f4
--- 1/man/man1/notmuch-count.1
--- 2/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-COUNT 1 2012-02-29 "Notmuch 0.12~rc1"
+ .TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2"
  .SH NAME
  notmuch-count \- Count messages matching the given search terms.
  .SH SYNOPSIS
@@@ -38,13 -38,6 +38,13 @@@ Output the number of matching messages
  Output the number of matching threads.
  .RE
  .RE
 +
 +.RS 4
 +.TP 4
 +.BR \-\-no\-exclude
 +
 +Do not exclude the messages matching search.exclude_tags in the config file.
 +.RE
  .RE
  .RE
  

diff --combined man/man1/notmuch-search.1
index c62ad18511b43eaf2e195fd441e5ccde994da6de,2cf830aa74312dce407e325bbb6c0b067272fd17..1b0c415f07352cc25b1a83a57048f30385d8ba86
--- 1/man/man1/notmuch-search.1
--- 2/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-SEARCH 1 2012-02-29 "Notmuch 0.12~rc1"
+ .TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2"
  .SH NAME
  notmuch-search \- Search for messages matching the given search terms.
  .SH SYNOPSIS
@@@ -112,13 -112,6 +112,13 @@@ result from the end
  Limit the number of displayed results to N.
  .RE
  
 +.RS 4
 +.TP 4
 +.BR \-\-no\-exclude
 +
 +Do not exclude the messages matching search.exclude_tags in the config file.
 +.RE
 +
  .SH SEE ALSO
  
  \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),

diff --combined man/man1/notmuch-show.1
index ebdd189fa0980710990ddd42810ba83a7f7e1061,48c7e0b24a9560b35db7d422e0f9dd5424953cf1..7bf1d569464beac02d47ed1a48592c77f8455ee3
--- 1/man/man1/notmuch-show.1
--- 2/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-SHOW 1 2012-02-29 "Notmuch 0.12~rc1"
+ .TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2"
  .SH NAME
  notmuch-show \- Show messages matching the given search terms.
  .SH SYNOPSIS
@@@ -128,13 -128,6 +128,13 @@@ multipart/encrypted part will be replac
  content.
  .RE
  
 +.RS 4
 +.TP 4
 +.B \-\-no-exclude
 +
 +Do not exclude the messages matching search.exclude_tags in the config file.
 +.RE
 +
  A common use of
  .B notmuch show
  is to display a single thread of email messages. For this, use a