X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.1;h=eeb1a948ac8c3da69915887a8adc8578a4c1c995;hp=d95e9093bd46e618b0248255496652fcb3e63798;hb=91d1d3f043b82d5f3f8c04f2db71a829a7406131;hpb=4443bb15e6eae884999ee9c2d939717b049429a0

diff --git a/notmuch.1 b/notmuch.1
index d95e9093..eeb1a948 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -53,9 +53,10 @@ Interactively sets up notmuch for first use.
 The setup command will prompt for your full name, your primary email
 address, any alternate email addresses you use, and the directory
 containing your email archives. Your answers will be written to a
-configuration file in ${HOME}/.notmuch-config . This configuration
-file will be created with descriptive comments, making it easy to edit
-by hand later to change the configuration. Or you can run
+configuration file in ${NOTMUCH_CONFIG} (if set) or
+${HOME}/.notmuch-config . This configuration file will be created with
+descriptive comments, making it easy to edit by hand later to change the
+configuration. Or you can run
 .B "notmuch setup"
 again to change the configuration.
 
@@ -137,7 +138,7 @@ The
 commands are used to query the email database.
 .RS 4
 .TP 4
-.BR search " [options] <search-term>..."
+.BR search " [options...] <search-term>..."
 
 Search for messages matching the given search terms, and display as
 results the threads containing the matched messages.
@@ -242,11 +243,11 @@ Constructs a reply template for a set of messages.
 To make replying to email easier,
 .B notmuch reply
 takes an existing set of messages and constructs a suitable mail
-template. It take the content of the Reply-to header (if any,
-otherwise From:) and places it int the To: header. It also copies any
-value from the To: and CC: lists, but avoids including any of the
-current user's email addresses (as configured in primary_mail or
-other_email in the .notmuch-config file) in the recipient list
+template. The Reply-to header (if any, otherwise From:) is used for
+the To: address. Vales from the To: and Cc: headers are copied, but
+not including any of the current user's email addresses (as configured
+in primary_mail or other_email in the .notmuch-config file) in the
+recipient list
 
 It also builds a suitable new subject, including Re: at the front (if
 not already present), and adding the message IDs of the messages being