Tweak previous NEWS change

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

diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 5e80eb108248d46dd8b626b01171092dc8e6c9f9..95f3c6b661bc944920ed0bb47da2080be982d48a 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
@@ -12,7 +12,7 @@
 @kindex C-x m
 @findex compose-mail
   To send an email message from Emacs, type @kbd{C-x m}.  This
-switches to a buffer named @samp{*unsent mail*}, where you can edit
+switches to a buffer named @file{*unsent mail*}, where you can edit
 the text and headers of the message.  When done, type @kbd{C-c C-s} or
 @kbd{C-c C-c} to send it.
 
@@ -74,8 +74,8 @@ CC: mongol.soldier@@example.net, rms@@gnu.org
 Subject: Re: What is best in life?
 From: conan@@example.org
 --text follows this line--
-To crush your enemies, see them driven before you, and to hear the
-lamentation of their women.
+To crush your enemies, see them driven before you, and to
+hear the lamentation of their women.
 @end example
 
 @noindent
@@ -113,7 +113,7 @@ people use only standard field names with accepted meanings.
 @vindex user-full-name
 @vindex user-mail-address
   The @samp{From} header field identifies the person sending the email
-(i.e.@: you).  This should be a valid mailing address, as replies are
+(i.e., you).  This should be a valid mailing address, as replies are
 normally sent there.  The default contents of this header field are
 computed from the variables @code{user-full-name} (which specifies
 your full name) and @code{user-mail-address} (your email address).  On
@@ -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
@@ -306,7 +306,7 @@ completion, and inserts its definition at point.
 @cindex Message mode
 @cindex mode, Message
 
-  The default major mode for the @samp{*mail*} buffer is called
+  The default major mode for the @file{*mail*} buffer is called
 Message mode.  It behaves like Text mode in many ways, but provides
 several additional commands on the @kbd{C-c} prefix, which make
 editing a message more convenient.
@@ -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