[Emacs-diffs] emacs-24 r117022: Fix bug #17308 with inaccurate description of mail signature handling.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117022
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17308
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-04-26 10:46:18 +0300
message:
  Fix bug #17308 with inaccurate description of mail signature handling.
  
   doc/emacs/sending.texi (Mail Signature): Document signature variables used
   by Message mode.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/sending.texi         
sending.texi-20091113204419-o5vbwnq5f7feedwu-6277

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-04-21 14:50:19 +0000
+++ b/doc/emacs/ChangeLog       2014-04-26 07:46:18 +0000
@@ -1,3 +1,8 @@
+2014-04-26  Eli Zaretskii  <address@hidden>
+
+       * sending.texi (Mail Signature): Document signature variables used
+       by Message mode.  (Bug#17308)
+
 2014-04-21  Eli Zaretskii  <address@hidden>
 
        * buffers.texi (Uniquify): Clarify the default uniquification.

=== modified file 'doc/emacs/sending.texi'
--- a/doc/emacs/sending.texi    2014-01-01 07:43:34 +0000
+++ b/doc/emacs/sending.texi    2014-04-26 07:46:18 +0000
@@ -592,31 +592,37 @@
 @section Mail Signature
 
 @cindex mail signature
address@hidden mail-signature-file
address@hidden mail-signature
address@hidden message-signature-file
address@hidden 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.
 
address@hidden mail-signature-file
address@hidden 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