X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=man%2Fman1%2Fnotmuch.1;h=6bf9b2e7c09280e4374f89b068a9b9cd519ce709;hb=3d19e6f1fdc179c3957866e29b9bd5da70eb0dce;hp=fb8c0018efeb2264d2b9d1feab6968116fc00704;hpb=8026b4a9ff6bb5d70e48bcd8c557fecefb222a03;p=obsolete%2Fnotmuch-old

diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
index fb8c0018..6bf9b2e7 100644
--- a/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@ -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 2011-12-04 "Notmuch 0.10.2"
+.TH NOTMUCH 1 2013-01-18 "Notmuch 0.15"
 .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,6 +50,26 @@ interfaces to notmuch. The emacs-based interface to notmuch (available under
 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
 
 
@@ -93,9 +113,8 @@ if the setup command has not previously been completed.
 .SS OTHER COMMANDS
 
 Several of the notmuch commands accept search terms with a common
-syntax. See the
-.B "SEARCH SYNTAX"
-section below for more details on the supported syntax.
+syntax. See \fNnotmuch-search-terms\fR(7)
+for more details on the supported syntax.
 
 The
 .BR search ", " show " and " count
@@ -130,6 +149,13 @@ Specifies the location of the notmuch configuration file. Notmuch will
 use ${HOME}/.notmuch\-config if this variable is not set.
 .SH SEE ALSO
 
+\fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
+\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
+\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
+\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
+\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)
+
+
 The notmuch website:
 .B http://notmuchmail.org
 .SH CONTACT