Merge from origin/emacs-24

[gnu-emacs] / doc / misc / message.texi

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 7421360211ca3f476a638e44c506a3c8c9ce45af..6e49c0a347c151b4aa7cce3f0417ea20096c99ce 100644 (file)
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2,7 +2,7 @@
 
 @include gnus-overrides.texi
 
-@setfilename ../../info/message
+@setfilename ../../info/message.info
 @settitle Message Manual
 @documentencoding UTF-8
 @synindex fn cp
@@ -11,7 +11,7 @@
 @copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright @copyright{} 1996--2014 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2015 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -310,7 +310,13 @@ news.
 @table @code
 @item message-forward-ignored-headers
 @vindex message-forward-ignored-headers
-All headers that match this regexp will be deleted when forwarding a message.
+In non-@code{nil}, all headers that match this regexp will be deleted
+when forwarding a message.
+
+@item message-forward-included-headers
+@vindex message-forward-included-headers
+In non-@code{nil}, only headers that match this regexp will be kept
+when forwarding a message.
 
 @item message-make-forward-subject-function
 @vindex message-make-forward-subject-function