Sundry documentation nits fixed.

Debian #210679, #254294, #258621, #272579

diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 7b682322ebad00d8364429f0d2c807418453c347..cb5db16c1356b6c6fc605c2572013c4a533a83cc 100644 (file)
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -3173,6 +3173,8 @@ The following are the commands understood by mutt.
 <item>
 <tt><ref id="send-hook" name="send-hook"></tt> <em/regexp/ <em/command/
 <item>
+<tt><ref id="reply-hook" name="reply-hook"></tt> <em/regexp/ <em/command/
+<item>
 <tt><ref id="set" name="set"></tt> &lsqb;no|inv&rsqb;<em/variable/&lsqb;=<em/value/&rsqb; &lsqb; <em/variable/ ... &rsqb;
 <item>
 <tt><ref id="set" name="unset"></tt> <em/variable/ &lsqb;<em/variable/ ... &rsqb;

diff --git a/doc/mutt.man b/doc/mutt.man
index 57c6101d6a708990decd9f869ce7e8de7e2f7f9e..8d312ac33951f4ec9220a3983b39cac84d99b729 100644 (file)
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -84,7 +84,7 @@ Causes Mutt to bypass the system configuration file.
 .IP "-p"
 Resume a postponed message.
 .IP "-Q \fIquery\fP"
-Qeury a configuration variables value.  The query is executed after
+Query a configuration variables value.  The query is executed after
 all configuration files have been parsed, and any commands given on
 the command line have been executed.
 .IP "-R"

diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index a60ca056dce9eb23cc23bb5de11a3a6c76ed07a0..fbd2e6817434503ae98891cbfc370bf08b905c74 100644 (file)
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -101,7 +101,7 @@ as an argument.
 .PP
 .nf
 \fBauto_view\fP \fItype\fP[\fB/\fP\fIsubtype\fP] [ ... ]
-\fBunauto_view\fP \fItype\fP[fB/\fP\fIsubtype\fP] [ ... ]
+\fBunauto_view\fP \fItype\fP[\fB/\fP\fIsubtype\fP] [ ... ]
 .fi
 .IP
 This commands permits you to specify that mutt should automatically
@@ -303,6 +303,13 @@ message's from header is changed.
 \fBsend2-hook\fP execution is not triggered by use of
 \fBenter-command\fP from the compose menu.
 .TP
+\fBreply-hook\fP [\fB!\fP]\fIpattern\fP \fIcommand\fP
+When replying to a message matching \fIpattern\fP, \fIcommand\fP is
+executed.  When multiple \fBreply-hook\fPs match, they are executed
+in the order in which they occur in the configuration file, but all
+\fBreply-hook\fPs are matched and executed before \fBsend-hook\fPs,
+regardless of their order in the configuration file.
+.TP
 \fBcrypt-hook\fP \fIpattern\fP \fIkey-id\fP
 The crypt-hook command provides a method by which you can
 specify the ID of the public key to be used when encrypting messages

diff --git a/init.h b/init.h
index 105713447ed63b206ee4d05b7482315b0a59337f..7e08426dedaeca19081b25db08cbced65e2ca92b 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2178,8 +2178,10 @@ struct option_t MuttVars[] = {
   ** move the messages to another machine, and reply to some the messages
   ** from there.  If this variable is set, the default \fIFrom:\fP line of
   ** the reply messages is built using the address where you received the
-  ** messages you are replying to.  If the variable is unset, the
-  ** \fIFrom:\fP line will use your address on the current machine.
+  ** messages you are replying to \fBif\fP that address matches your
+  ** alternates.  If the variable is unset, or the address that would be
+  ** used doesn't match your alternates, the \fIFrom:\fP line will use
+  ** your address on the current machine.
   */
   { "reverse_realname",        DT_BOOL, R_BOTH, OPTREVREAL, 1 },
   /*