From: David Bremner <bremner@debian.org>
Date: Sun, 18 Mar 2012 11:36:33 +0000 (-0300)
Subject: Merge tag '0.12_rc2'
X-Git-Tag: 0.13_rc1~157
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=fc4e5248d29cf7264481cbff82343eade5fcc2ca;hp=-c

Merge tag '0.12_rc2'

notmuch 0.12~rc2 release
---

fc4e5248d29cf7264481cbff82343eade5fcc2ca
diff --combined man/man1/notmuch-config.1
index d22988a7,fb023b8c..a8c17d81
--- a/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 f593065a,383252e3..302a7fa7
--- a/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 c62ad185,2cf830aa..1b0c415f
--- a/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 ebdd189f,48c7e0b2..7bf1d569
--- a/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