Merge from origin/emacs-25

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

diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 02b38cc6748b75a605339df30ecff92ca67770b8..c5ca73b40a80b7d34221ce074290e01f0b578d14 100644 (file)
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Sending Mail
@@ -136,7 +136,7 @@ Use both address and full name, as in:@*
 Use both address and full name, as in:@*
 @samp{Elvis Parsley <king@@grassland.com>}.
 @item any other value
-Use @code{angles} normally.  But if the address must be ``quoted'' to
+Use @code{angles} normally.  But if the address must be quoted to
 remain syntactically valid under the @code{angles} format but not
 under the @code{parens} format, use @code{parens} instead.  This is
 the default.
@@ -159,7 +159,7 @@ directed at them.
 
 @item BCC
 Additional mailing address(es) to send the message to, which should
-not appear in the header of the message actually sent.  ``BCC'' stands
+not appear in the header of the message actually sent.  @samp{BCC} stands
 for @dfn{blind carbon copies}.
 
 @item FCC
@@ -276,7 +276,7 @@ of the address, such as the person's full name.  Emacs puts them in if
 they are needed.  For instance, it inserts the above address as
 @samp{"John Q. Smith" <none@@example.com>}.
 
-  Emacs also recognizes ``include'' commands in @file{.mailrc}.  They
+  Emacs also recognizes include commands in @file{.mailrc}.  They
 look like this:
 
 @example
@@ -341,7 +341,7 @@ Send the message, and leave the mail buffer selected (@code{message-send}).
 @vindex message-kill-buffer-on-exit
   The usual command to send a message is @kbd{C-c C-c}
 (@code{mail-send-and-exit}).  This sends the message and then
-``buries'' the mail buffer, putting it at the lowest priority for
+buries the mail buffer, putting it at the lowest priority for
 reselection.  If you want it to kill the mail buffer instead, change
 the variable @code{message-kill-buffer-on-exit} to @code{t}.
 
@@ -568,8 +568,8 @@ was yanked, but it checks the text that you yourself inserted (it
 looks for indentation or @code{mail-yank-prefix} to distinguish the
 cited lines from your input).  @xref{Spelling}.
 
-@vindex mail-mode-hook
-@vindex mail-setup-hook
+@vindex message-mode-hook
+@vindex message-setup-hook
   Turning on Message mode (which @kbd{C-x m} does automatically) runs
 the normal hooks @code{text-mode-hook} and @code{message-mode-hook}.
 Initializing a new outgoing message runs the normal hook
@@ -648,7 +648,7 @@ it all.  Whether or not this is true, it at least amuses some people.
 
 @findex fortune-to-signature
 @cindex fortune cookies
-  You can use the @code{fortune} program to put a ``fortune cookie''
+  You can use the @code{fortune} program to put a fortune cookie
 message into outgoing mail.  To do this, add
 @code{fortune-to-signature} to @code{mail-setup-hook}: