*** empty log message ***

2 files changed, 11 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 653fd279f63..7dcd709b4db 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -48,6 +48,7 @@ operate on the active region in Transient Mark mode.
 remains visible even when the buffer has been scrolled.  This behavior
 may be disabled by customizing the option `Info-use-header-line'.
 
++++
 ** `gnus-user-agent' is a new possibility for `mail-user-agent'.  It
 is like `message-user-agent', but with all the Gnus paraphernalia.
 
@@ -55,6 +56,7 @@ is like `message-user-agent', but with all the Gnus paraphernalia.
 ** The recommended way of using Iswitchb is via the new global minor
 mode `iswitchb-mode'.
 
++++
 ** Gnus changes.
 
 The Gnus NEWS entries are short, but they reflect sweeping changes in
@@ -553,6 +555,7 @@ terminals having terminal capabilities `vi', `vs', and `ve'.  Blinking
 and related parameters like frequency and delay can be customized in
 the group `cursor'.
 
++++
 ** New font-lock support mode `jit-lock-mode'.
 
 This support mode is roughly equivalent to `lazy-lock' but is
@@ -590,6 +593,7 @@ Horizontal scrolling now happens automatically if
 `automatic-hscrolling' is set (the default).  This setting can be
 customized.
 
++++
 ** Tool bar support.
 
 Emacs supports a tool bar at the top of a frame under X.  For details
diff --git a/man/message.texi b/man/message.texi
index defef7d2c8b..bc288f5c750 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -22,8 +22,8 @@ Copyright (C) 1996,97,98,99,2000 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being none, with the Front-Cover texts being ``A GNU
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU
 Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
 license is included in the section entitled ``GNU Free Documentation
 License'' in the Emacs manual.
@@ -777,6 +777,11 @@ have to deal with users that use these evil tools, in which case you may
 set this variable to a regexp that matches these prefixes.  Myself, I
 just throw away non-compliant mail.
 
+@item message-alternative-emails
+@vindex message-alternative-emails
+A regexp to match the alternative email addresses.  The first matched
+address (not primary one) is used in the @code{From} field.
+
 @end table