Import Oort Gnus v0.16.

[elisp/gnus.git-] / texi / message.texi

diff --git a/texi/message.texi b/texi/message.texi
index c8ca154..cf06576 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -686,7 +686,7 @@ headers if necessary.
 @findex message-change-subject
 @cindex Subject
 Change the current @samp{Subject} header.  Ask for new @samp{Subject}
-header and append @code{(was: <Old Subject>)}.  The old subject can be
+header and append @samp{(was: <Old Subject>)}.  The old subject can be
 stripped on replying, see @code{message-subject-trailing-was-query}
 (@pxref{Message Headers}).
 
@@ -906,10 +906,10 @@ message a single part tag will be used.  This way, message mode will
 do the Right Thing (TM) with signed/encrypted multipart messages.
 
 @vindex mml-signencrypt-style-alist
-By default, when encrypting a message, Gnus will use the "signencrypt"
+By default, when encrypting a message, Gnus will use the ``signencrypt''
 mode.  If you would like to disable this for a particular message,
-give the mml-secure-message-encrypt-* command a prefix argument. (for
-example, C-u C-c C-m c p).  Additionally, by default Gnus will
+give the @code{mml-secure-message-encrypt-*} command a prefix argument. (for
+example, @kbd{C-u C-c C-m c p}).  Additionally, by default Gnus will
 separately sign, then encrypt a message which has the mode
 signencrypt.  If you would like to change this behavior you can
 customize the @code{mml-signencrypt-style-alist} variable.  For
@@ -1404,6 +1404,13 @@ might set this variable to @code{'("-f" "you@@some.where")}.
 Non-@code{nil} means don't add @samp{-f username} to the sendmail
 command line.  Doing so would be even more evil than leaving it out.
 
+@item message-sendmail-envelope-from
+@vindex message-sendmail-envelope-from
+When @code{message-sendmail-f-is-evil} is @code{nil}, this specifies
+the address to use in the SMTP envelope.  If it is @code{nil}, use
+@code{user-mail-address}.  If it is the symbol @code{header}, use the
+@samp{From} header of the message.
+
 @item message-mailer-swallows-blank-line
 @vindex message-mailer-swallows-blank-line
 Set this to non-@code{nil} if the system's mailer runs the header and
@@ -1466,14 +1473,18 @@ This optional header will be computed by Message.
 
 @item Message-ID
 @cindex Message-ID
+@vindex message-user-fqdn
 @vindex mail-host-address
+@vindex user-mail-address
 @findex system-name
 @cindex Sun
+@cindex i-did-not-set--mail-host-address--so-tickle-me
 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 use @code{system-name} to determine the name of the system.  If
-this isn't a fully qualified domain name (FQDN), Message will use
-@code{mail-host-address} as the FQDN of the machine.
+created based on the date, time, user name and system name.  For the
+domain part, message will look (in this order) at
+@code{message-user-fqdn}, @code{system-name}, @code{mail-host-address}
+and @code{message-user-mail-address} (i.e. @code{user-mail-address})
+until a probably valid fully qualified domain name (FQDN) was found.
 
 @item User-Agent
 @cindex User-Agent