--- a/man/message.texi	Mon Aug 13 08:48:43 2007 +0200
+++ b/man/message.texi	Mon Aug 13 08:49:20 2007 +0200
@@ -1,6 +1,6 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@setfilename ../info/message.info
+@setfilename message
 @settitle Message Manual
 @synindex fn cp
 @synindex vr cp
@@ -169,7 +169,9 @@
 
 @findex message-wide-reply
 The @code{message-wide-reply} pops up a message buffer that's a wide
-reply to the message in the current buffer.
+reply to the message in the current buffer.  A @dfn{wide reply} is a
+reply that goes out to all people listed in the @code{To}, @code{From}
+and @code{Cc} headers.
 
 @vindex message-wide-reply-to-function
 Message uses the normal methods to determine where wide replies are to go,
@@ -178,7 +180,7 @@
 @code{message-reply-to-function} (@pxref{Reply}). 
 
 @findex rmail-dont-reply-to-names
-Addresses that matches the @code{rmail-dont-reply-to-names} regular
+Addresses that match the @code{rmail-dont-reply-to-names} regular
 expression will be removed from the @code{Cc} header.
 
 
@@ -220,8 +222,9 @@
 
 @vindex message-ignored-supersedes-headers
 Headers matching the @code{message-ignored-supersedes-headers} are
-removed before popping up the new message buffer.  The default is
-@samp{^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|^Received:\\|^X-From-Line:\\|Return-Path:}.
+removed before popping up the new message buffer.  The default is@*
+@samp{^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|@*
+^Received:\\|^X-From-Line:\\|Return-Path:}.
 
 
 
@@ -236,13 +239,13 @@
 @table @code
 @item message-forward-start-separator
 @vindex message-forward-start-separator
-Delimiter inserted before forwarded messages.  The default is
+Delimiter inserted before forwarded messages.  The default is@*
 @samp{------- Start of forwarded message -------\n}. 
 
 @vindex message-forward-end-separator
 @item message-forward-end-separator
 @vindex message-forward-end-separator
-Delimiter inserted after forwarded messages.  The default is
+Delimiter inserted after forwarded messages.  The default is@*
 @samp{------- End of forwarded message -------\n}. 
 
 @item message-signature-before-forwarded-message
@@ -266,7 +269,7 @@
 and resend the message in the current buffer to that address.
 
 @vindex message-ignored-resent-headers
-Headers the match the @code{message-ignored-resent-headers} regexp will
+Headers that match the @code{message-ignored-resent-headers} regexp will
 be removed before sending the message.  The default is
 @samp{^Return-receipt}. 
 
@@ -277,7 +280,9 @@
 @findex message-bounce
 The @code{message-bounce} command will, if the current buffer contains a
 bounced mail message, pop up a message buffer stripped of the bounce
-information.
+information.  A @dfn{bounced message} is typically a mail you've sent
+out that has been returned by some @code{mailer-daemon} as
+undeliverable. 
 
 @vindex message-ignored-bounced-headers
 Headers that match the @code{message-ignored-bounced-headers} regexp
@@ -471,7 +476,7 @@
 characters @samp{-- } on a line by themselves.  This is to make it
 easier for the recipient to automatically recognize and process the
 signature.  So don't remove those characters, even though you might feel
-that they ruin you beautiful design, like, totally.
+that they ruin your beautiful design, like, totally.
 
 Also note that no signature should be more than four lines long.
 Including ASCII graphics is an efficient way to get everybody to believe
@@ -492,6 +497,13 @@
 rotate the visible portion of the buffer.  A numerical prefix says how
 many places to rotate the text.  The default is 13.
 
+@item C-c C-e
+@kindex C-c C-e
+@findex message-elide-region
+Elide the text between point and mark (@code{message-elide-region}).
+The text is killed and an ellipsis (@samp{[...]}) will be inserted in
+its place.
+
 @item C-c C-t
 @kindex C-c C-t 
 @findex message-insert-to
@@ -622,7 +634,7 @@
 @table @code
 @item message-required-mail-headers
 @vindex message-required-mail-headers
-See @pxref{News Headers} for the syntax of this variable.  It is
+@xref{News Headers}, for the syntax of this variable.  It is
 @code{(From Date Subject (optional . In-Reply-To) Message-ID Lines
 (optional . X-Mailer))} by default.
 
@@ -697,9 +709,9 @@
 @findex system-name
 @cindex Sun
 This required header will be generated by Message.  A unique ID will be
-created based on date, time, user name and system name.  Message will
+created based on the date, time, user name and system name.  Message will
 use @code{mail-host-address} as the fully qualified domain name (FQDN)
-of the machine if that variable is define.  If not, it will use
+of the machine if that variable is defined.  If not, it will use
 @code{system-name}, which doesn't report a FQDN on some machines --
 notably Suns.
 
@@ -715,7 +727,7 @@
 
 @item In-Reply-To
 This optional header is filled out using the @code{Date} and @code{From}
-header of the article being replied.
+header of the article being replied to.
 
 @item Expires
 @cindex Expires
@@ -731,11 +743,11 @@
 
 @item Path
 @cindex path
-This extremely optional header should probably not ever be used.
+This extremely optional header should probably never be used.
 However, some @emph{very} old servers require that this header is
 present.  @code{message-user-path} further controls how this
-@code{Path} header is to look.  If is is @code{nil}, the the server name
-as the leaf node.  If is is a string, use the string.  If it is neither
+@code{Path} header is to look.  If it is @code{nil}, use the server name
+as the leaf node.  If it is a string, use the string.  If it is neither
 a string nor @code{nil}, use the user name only.  However, it is highly
 unlikely that you should need to fiddle with this variable at all.
 @end table
@@ -762,7 +774,7 @@
 
 @item message-syntax-checks
 @vindex message-syntax-checks
-If non-@code{nil}, message will attempt to check the legality of the
+If non-@code{nil}, Message will attempt to check the legality of the
 headers, as well as some other stuff, before posting.  You can control
 the granularity of the check by adding or removing elements from this
 list.  Legal elements are:
@@ -802,19 +814,22 @@
 @item empty-headers
 Check whether any of the headers are empty.
 @item existing-newsgroups
-Check whether the newsgroups mentioned in the Newsgroups and 
-Followup-To headers exist.
+Check whether the newsgroups mentioned in the @code{Newsgroups} and 
+@code{Followup-To} headers exist.
 @item valid-newsgroups
-Check whether the @code{Newsgroups} and @code{Followup-To} headers
-are valid syntactially.
+Check whether the @code{Newsgroups} and @code{Followup-to} headers
+are valid syntactically.
+@item shorten-followup-to
+Check whether to add a @code{Followup-to} header to shorten the number
+of groups to post to.
 @end table
 
 All these conditions are checked by default.
 
 @item message-ignored-news-headers
 @vindex message-ignored-news-headers
-Regexp of headers to be removed before posting.  The default is
-@samp{^NNTP-Posting-Host:\\|^Xref:\\|^Bcc:\\|^Gcc:\\|^Fcc:}. 
+Regexp of headers to be removed before posting.  The default is@*
+@samp{^NNTP-Posting-Host:\\|^Xref:\\|^Bcc:\\|^Gcc:\\|^Fcc:}.
 
 @item message-default-news-headers
 @vindex message-default-news-headers
@@ -879,6 +894,14 @@
 @vindex message-send-hook
 Hook run before sending messages.
 
+@item message-send-mail-hook
+@vindex message-send-mail-hook
+Hook run before sending mail messages.
+
+@item message-send-news-hook
+@vindex message-send-news-hook
+Hook run before sending news messages.
+
 @item message-sent-hook
 @vindex message-sent-hook
 Hook run after sending messages.
@@ -905,8 +928,11 @@
 @item message-courtesy-message
 @vindex message-courtesy-message
 When sending combined messages, this string is inserted at the start of
-the mailed copy.  If this variable is @code{nil}, no such courtesy
-message will be added.
+the mailed copy.  If the string contains the format spec @samp{%s}, the
+newsgroups the article has been posted to will be inserted there.  If
+this variable is @code{nil}, no such courtesy message will be added.
+The default value is @samp{"The following message is a courtesy copy of
+an article\nthat has been posted to %s as well.\n\n"}. 
 
 @end table
 
@@ -916,7 +942,7 @@
 
 Message will generate new buffers with unique buffer names when you
 request a message buffer.  When you send the message, the buffer isn't
-normally killed off.  It's name is changed and a certain number of old
+normally killed off.  Its name is changed and a certain number of old
 message buffers are kept alive.
 
 @table @code
@@ -988,8 +1014,8 @@
 This restores the Gnus window configuration when the message buffer is
 killed, postponed or exited.
 
-An @dfn{action} can be either a normal function; or a list where the
-@code{car} is a function and the @code{cdr} is the list of arguments; or
+An @dfn{action} can be either: a normal function, or a list where the
+@code{car} is a function and the @code{cdr} is the list of arguments, or
 a form to be @code{eval}ed.
 
 @node Index