X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/61655fd96ce959e47ad8d047387e5585843fc789..29993416fb4d19c1c3bb146367fc4bed74845486:/doc/misc/message.texi

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index a98c7e48e5..792aa4e9ea 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2,21 +2,22 @@
 
 @include gnus-overrides.texi
 
-@setfilename ../../info/message
+@setfilename ../../info/message.info
 @settitle Message Manual
+@documentencoding UTF-8
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
 @copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright @copyright{} 1996--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+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''.
 
@@ -309,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
@@ -741,9 +748,8 @@ by the @code{message-cross-post-note-function} variable.
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
-Replace contents of @samp{To} header with contents of @samp{Cc} or
-@samp{Bcc} header.  (Iff @samp{Cc} header is not present, @samp{Bcc}
-header will be used instead.)
+Replace contents of @samp{To} header with contents of @samp{Cc}
+header (or the @samp{Bcc} header, if there is no @samp{Cc} header).
 
 @item C-c C-f w
 @kindex C-c C-f w
@@ -1450,7 +1456,7 @@ Look like @code{angles} if that doesn't require quoting, and
 Headers in this list that were previously generated by Message will be
 deleted before posting.  Let's say you post an article.  Then you decide
 to post it again to some other group, you naughty boy, so you jump back
-to the @code{*post-buf*} buffer, edit the @code{Newsgroups} line, and
+to the @file{*post-buf*} buffer, edit the @code{Newsgroups} line, and
 ship it off again.  By default, this variable makes sure that the old
 generated @code{Message-ID} is deleted, and a new one generated.  If
 this isn't done, the entire empire would probably crumble, anarchy would
@@ -2131,7 +2137,7 @@ translation process.
 @vindex message-fill-column
 @cindex auto-fill
 Local value for the column beyond which automatic line-wrapping should
-happen for message buffers.  If non-nil (the default), also turn on
+happen for message buffers.  If non-@code{nil} (the default), also turn on
 auto-fill in message buffers.
 
 @item message-signature-separator