Merge branch 'release'

[notmuch] / man / man1 / notmuch.1

diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
index 55e2d166facaadcb02d9aec6f899b84ce94ecca3..033cc107f31383119c9dd7e1bbc8bf8cb52c98bc 100644 (file)
--- a/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@ -16,7 +16,7 @@
 .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
 .\"
 .\" Author: Carl Worth <cworth@cworth.org>
-.TH NOTMUCH 1 2013-01-24 "Notmuch 0.15.1"
+.TH NOTMUCH 1 2013-02-17 "Notmuch 0.15.2"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS
@@ -70,6 +70,15 @@ Print a synopsis of available commands and exit.
 Print the installed version of notmuch, and exit.
 .RE
 
+.RS 4
+.TP 4
+.B \-\-config=FILE
+
+Specify the configuration file to use. This overrides any
+configuration file specified by ${NOTMUCH_CONFIG}.
+
+.RE
+
 .SH COMMANDS
 
 
@@ -155,6 +164,11 @@ Location to write a talloc memory usage report. See
 in \fBtalloc\fR(3)
 for more information.
 
+.TP
+.B NOTMUCH_DEBUG_QUERY
+If set to a non-empty value, the notmuch library will print (to stderr) Xapian
+queries it constructs.
+
 .SH SEE ALSO
 
 \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),