Replace doc/*/Makefile.in dist rules with code in admin/admin.el

[gnu-emacs] / doc / emacs / sending.texi

diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 732078a6a65b7c22c18466ba1d0f6ad42d310b95..02b38cc6748b75a605339df30ecff92ca67770b8 100644 (file)
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
+@c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Sending Mail
 @chapter Sending Mail
@@ -256,7 +256,7 @@ This means that @var{nick} should expand into @var{fulladdresses},
 where @var{fulladdresses} can be either a single address, or multiple
 addresses separated with spaces.  For instance, to make @code{maingnu}
 stand for @code{gnu@@gnu.org} plus a local address of your own, put in
-this line:@refill
+this line:
 
 @example
 alias maingnu gnu@@gnu.org local-gnu
@@ -374,7 +374,7 @@ This is the default, unless you have already set the variables for
 sending mail via @code{smtpmail-send-it} (see below).
 
 @item smtpmail-send-it
-Send mail using the through an external mail host, such as your
+Send mail through an external mail host, such as your
 Internet service provider's outgoing SMTP mail server.  If you have
 not told Emacs how to contact the SMTP server, it prompts for this
 information, which is saved in the @code{smtpmail-smtp-server} variable
@@ -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