Fix bug #17308 with inaccurate description of mail signature handling.

 doc/emacs/sending.texi (Mail Signature): Document signature variables used
 by Message mode.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 12037aae275903c3c8e4c8b3ebc7d35adf7c4fdd..1e002127be64345d9d487630ae2c65c9610cd72b 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * sending.texi (Mail Signature): Document signature variables used
+       by Message mode.  (Bug#17308)
+
 2014-04-21  Eli Zaretskii  <eliz@gnu.org>
 
        * buffers.texi (Uniquify): Clarify the default uniquification.

diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 95f3c6b661bc944920ed0bb47da2080be982d48a..02b38cc6748b75a605339df30ecff92ca67770b8 100644 (file)
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -592,31 +592,37 @@ are inserted.
 @section Mail Signature
 
 @cindex mail signature
-@vindex mail-signature-file
-@vindex mail-signature
+@vindex message-signature-file
+@vindex message-signature
   You can add a standard piece of text---your @dfn{mail
 signature}---to the end of every message.  This signature may contain
 information such as your telephone number or your physical location.
-The variable @code{mail-signature} determines how Emacs handles the
+The variable @code{message-signature} determines how Emacs handles the
 mail signature.
 
-  The default value of @code{mail-signature} is @code{t}; this means
-to look for your mail signature in the file @file{~/.signature}.  If
-this file exists, its contents are automatically inserted into the end
-of the mail buffer.  You can change the signature file via the
-variable @code{mail-signature-file}.
+  The default value of @code{message-signature} is @code{t}; this
+means to look for your mail signature in the file @file{~/.signature}.
+If this file exists, its contents are automatically inserted into the
+end of the mail buffer.  You can change the signature file via the
+variable @code{message-signature-file}.
 
-  If you change @code{mail-signature} to a string, that specifies the
-text of the signature directly.
+  If you change @code{message-signature} to a string, that specifies
+the text of the signature directly.
 
 @kindex C-c C-w @r{(Message mode)}
 @findex message-insert-signature
-  If you change @code{mail-signature} to @code{nil}, Emacs will not
+  If you change @code{message-signature} to @code{nil}, Emacs will not
 insert your mail signature automatically.  You can insert your mail
 signature by typing @kbd{C-c C-w} (@code{message-insert-signature}) in
 the mail buffer.  Emacs will look for your signature in the signature
 file.
 
+@vindex mail-signature-file
+@vindex mail-signature
+  If you use Mail mode rather than Message mode for composing your
+mail, the corresponding variables that determine how your signature is
+sent are @code{mail-signature} and @code{mail-signature-file} instead.
+
   By convention, a mail signature should be marked by a line whose
 contents are @samp{-- }.  If your signature lacks this prefix, it is
 added for you.  The remainder of your signature should be no more than