From: David Bremner <bremner@debian.org>
Date: Fri, 25 Jan 2013 02:29:09 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.16_rc1~219
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7264732a794b8d59b0aeef395e74381beb4b90f7;hp=-c

Merge branch 'release'

Conflicts:
	NEWS

Inserted news from 0.15.1
---

7264732a794b8d59b0aeef395e74381beb4b90f7
diff --combined NEWS
index 9db9daf0,97f23058..9bd7a11e
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,12 +1,20 @@@
 +Notmuch 0.16 (2013-MM-DD)
 +=========================
 +
 +Command-Line Interface
 +----------------------
 +
 +Deprecated commands "part" and "search-tags" are removed.
 +
+ Notmuch 0.15.1 (2013-01-24)
+ =========================
+ 
+ Internal test framework changes
+ -------------------------------
+ 
+ Set a default value for TERM when running tests. This fixes certain
+ build failures in non-interactive environments.
+ 
  Notmuch 0.15 (2013-01-18)
  =========================
  
@@@ -190,8 -191,8 +199,8 @@@ Internal test framework change
  
  The emacsclient binary is now user-configurable
  
 -  The test framework now accepts TEST_EMACSCLIENT in addition to
 -  TEST_EMACS for configuring the emacsclient to use.  This is
 +  The test framework now accepts `TEST_EMACSCLIENT` in addition to
 +  `TEST_EMACS` for configuring the emacsclient to use.  This is
    necessary to avoid using an old emacsclient with a new emacs, which
    can result in buggy behavior.
  
diff --combined man/man1/notmuch.1
index 6bf9b2e7,9b25c275..0805be83
--- a/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@@ -16,12 -16,12 +16,12 @@@
  .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
  .\"
  .\" Author: Carl Worth <cworth@cworth.org>
- .TH NOTMUCH 1 2013-01-18 "Notmuch 0.15"
+ .TH NOTMUCH 1 2013-01-24 "Notmuch 0.15.1"
  .SH NAME
  notmuch \- thread-based email index, search, and tagging
  .SH SYNOPSIS
  .B notmuch
 -.IR command " [" args " ...]"
 +.RI "[" option " ...] " command  " [" arg " ...]"
  .SH DESCRIPTION
  Notmuch is a command-line based program for indexing, searching,
  reading, and tagging large collections of email messages.
@@@ -50,26 -50,6 +50,26 @@@ interfaces to notmuch. The emacs-based 
  in the Notmuch source distribution) is probably the most widely used at
  this time.
  
 +.SH OPTIONS
 +
 +Supported global options for
 +.B notmuch
 +include
 +
 +.RS 4
 +.TP 4
 +.B \-\-help
 +
 +Print a synopsis of available commands and exit.
 +.RE
 +
 +.RS 4
 +.TP 4
 +.B \-\-version
 +
 +Print the installed version of notmuch, and exit.
 +.RE
 +
  .SH COMMANDS