--- a/man/message.texi	Mon Aug 13 09:00:04 2007 +0200
+++ b/man/message.texi	Mon Aug 13 09:02:59 2007 +0200
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@setfilename message
-@settitle Message 5.4.37 Manual
+@setfilename ../info/message.info
+@settitle Message Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -12,7 +12,7 @@
 
 @ifinfo
 
-This file documents Message, the Emacs message composition mode.
+This file documents Messa, the Emacs message composition mode.
 
 Copyright (C) 1996 Free Software Foundation, Inc.
 
@@ -39,7 +39,7 @@
 @tex
 
 @titlepage
-@title Message 5.4.37 Manual
+@title Message Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -74,15 +74,10 @@
 * Interface::         Setting up message buffers.
 * Commands::          Commands you can execute in message mode buffers.
 * Variables::         Customizing the message buffers.
-* Compatibility::     Making Message backwards compatible.
 * Index::             Variable, function and concept index.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 5.4.37.  Message is distributed with
-the Gnus distribution bearing the same version number as this manual
-has. 
-
 
 @node Interface
 @chapter Interface
@@ -174,9 +169,7 @@
 
 @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.  A @dfn{wide reply} is a
-reply that goes out to all people listed in the @code{To}, @code{From}
-and @code{Cc} headers.
+reply to the message in the current buffer.
 
 @vindex message-wide-reply-to-function
 Message uses the normal methods to determine where wide replies are to go,
@@ -185,7 +178,7 @@
 @code{message-reply-to-function} (@pxref{Reply}). 
 
 @findex rmail-dont-reply-to-names
-Addresses that match the @code{rmail-dont-reply-to-names} regular
+Addresses that matches the @code{rmail-dont-reply-to-names} regular
 expression will be removed from the @code{Cc} header.
 
 
@@ -227,9 +220,8 @@
 
 @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:}.
 
 
 
@@ -244,13 +236,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
@@ -274,7 +266,7 @@
 and resend the message in the current buffer to that address.
 
 @vindex message-ignored-resent-headers
-Headers that match the @code{message-ignored-resent-headers} regexp will
+Headers the match the @code{message-ignored-resent-headers} regexp will
 be removed before sending the message.  The default is
 @samp{^Return-receipt}. 
 
@@ -285,9 +277,7 @@
 @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.  A @dfn{bounced message} is typically a mail you've sent
-out that has been returned by some @code{mailer-daemon} as
-undeliverable. 
+information.
 
 @vindex message-ignored-bounced-headers
 Headers that match the @code{message-ignored-bounced-headers} regexp
@@ -304,7 +294,6 @@
 * Insertion::           Inserting things into message buffers.
 * Various Commands::    Various things.
 * Sending::             Actually sending the message.
-* Mail Aliases::        How to use mail aliases.
 @end menu
 
 
@@ -482,7 +471,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 your beautiful design, like, totally.
+that they ruin you 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
@@ -503,13 +492,6 @@
 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
@@ -561,30 +543,6 @@
 @end table
 
 
-
-@node Mail Aliases
-@section Mail Aliases
-@cindex mail aliases
-@cindex aliases
-
-Message uses @code{mailabbrev} to handle mail aliases.  
-@code{mailabbrev} works by parsing the @file{/etc/mailrc} and
-@file{~/.mailrc} files.  These files look like:
-
-@example
-alias lmi "Lars Magne Ingebrigtsen <larsi@@ifi.uio.no>"
-alias ding "ding@@ifi.uio.no (ding mailing list)"
-@end example
-
-After adding lines like this to your @file{~/.mailrc} file, you should
-be able to just write @samp{lmi} in the @code{To} or @code{Cc} (and so
-on) headers and press @kbd{SPC} to expand the alias.
-
-No expansion will be performed upon sending of the message---all
-expansions have to be done explicitly.
-
-
-
 @node Variables
 @chapter Variables
 
@@ -664,7 +622,7 @@
 @table @code
 @item message-required-mail-headers
 @vindex message-required-mail-headers
-@xref{News Headers}, for the syntax of this variable.  It is
+See @pxref{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.
 
@@ -691,13 +649,6 @@
 @code{message-send-mail-with-sendmail}.   If you prefer using MH
 instead, set this variable to @code{message-send-mail-with-mh}.
 
-@item message-mh-deletable-headers
-@vindex message-mh-deletable-headers
-Most versions of MH doesn't like being fed messages that contain the
-headers in this variable.  If this variable is non-@code{nil} (which is
-the default), these headers will be removed before mailing.  Set it to
-@code{nil} if your MH can handle these headers.
-
 @end table
 
 
@@ -733,10 +684,8 @@
 @cindex organization
 This optional header will be filled out depending on the
 @code{message-user-organization} variable.
-@code{message-user-organization-file} will be used if this variable is
-@code{t}.  This variable can also be a string (in which case this string
-will be used), or it can be a function (which will be called with no
-parameters and should return a string to be used).
+@code{message-user-organization-file} will be used if that variable is
+@code{t}.
 
 @item Lines
 @cindex Lines
@@ -748,9 +697,9 @@
 @findex system-name
 @cindex Sun
 This required header will be generated by Message.  A unique ID will be
-created based on the date, time, user name and system name.  Message will
+created based on 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 defined.  If not, it will use
+of the machine if that variable is define.  If not, it will use
 @code{system-name}, which doesn't report a FQDN on some machines --
 notably Suns.
 
@@ -766,7 +715,7 @@
 
 @item In-Reply-To
 This optional header is filled out using the @code{Date} and @code{From}
-header of the article being replied to.
+header of the article being replied.
 
 @item Expires
 @cindex Expires
@@ -782,11 +731,11 @@
 
 @item Path
 @cindex path
-This extremely optional header should probably never be used.
+This extremely optional header should probably not ever 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 it is @code{nil}, use the server name
-as the leaf node.  If it is a string, use the string.  If it is neither
+@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
 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
@@ -813,7 +762,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:
@@ -853,22 +802,19 @@
 @item empty-headers
 Check whether any of the headers are empty.
 @item existing-newsgroups
-Check whether the newsgroups mentioned in the @code{Newsgroups} and 
-@code{Followup-To} headers exist.
+Check whether the newsgroups mentioned in the Newsgroups and 
+Followup-To headers exist.
 @item valid-newsgroups
-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.
+Check whether the @code{Newsgroups} and @code{Followup-To} headers
+are valid syntactially.
 @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
@@ -929,33 +875,10 @@
 @vindex message-header-setup-hook
 Hook called narrowed to the headers after initializing the headers. 
 
-For instance, if you're running Gnus and wish to insert a
-@samp{Mail-Copies-To} header in all your news articles and all messages
-you send to mailing lists, you could do something like the following:
-
-@lisp
-(defun my-message-header-setup-hook ()
-  (let ((group (or gnus-newsgroup-name "")))
-    (when (or (message-fetch-field "newsgroups")
-              (gnus-group-find-parameter group 'to-address)
-              (gnus-group-find-parameter group 'to-list))
-      (insert "Mail-Copies-To: never\n"))))
-
-(add-hook 'message-header-setup-hook 'my-message-header-setup-hook)
-@end lisp
-
 @item message-send-hook
 @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.
@@ -982,11 +905,8 @@
 @item message-courtesy-message
 @vindex message-courtesy-message
 When sending combined messages, this string is inserted at the start of
-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"}. 
+the mailed copy.  If this variable is @code{nil}, no such courtesy
+message will be added.
 
 @end table
 
@@ -996,7 +916,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.  Its name is changed and a certain number of old
+normally killed off.  It's name is changed and a certain number of old
 message buffers are kept alive.
 
 @table @code
@@ -1068,28 +988,10 @@
 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 Compatibility
-@chapter Compatibility
-@cindex compatibility
-
-Message uses virtually only its own variables---older @code{mail-}
-variables aren't consulted.  To force Message to take those variables
-into account, you can put the following in your @code{.emacs} file:
-
-@lisp
-(require 'messcompat)
-@end lisp
-
-This will initialize many Message variables from the values in the
-corresponding mail variables.
-
-
-
 @node Index
 @chapter Index
 @printindex cp