X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8d99e09d789d6808b910846b6d5c5a4bfc7f4c0c..32ccc8a5747ec380a9375251e1285264356b8866:/man/sending.texi

diff --git a/man/sending.texi b/man/sending.texi
index 4670a98f46..5d6a7c83f3 100644
--- a/man/sending.texi
+++ b/man/sending.texi
@@ -1,8 +1,8 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Sending Mail, Rmail, Picture, Top
+@node Sending Mail
 @chapter Sending Mail
 @cindex sending mail
 @cindex mail
@@ -93,9 +93,10 @@ header fields, such as @samp{Date} and @samp{Sender}, are created
 automatically when you send the message.  Others, such as the recipient
 names, must be specified by you in order to send the message properly.
 
-  Mail mode provides a few commands to help you edit some header fields,
-and some are preinitialized in the buffer automatically at times.  You can
-insert and edit header fields using ordinary editing commands.
+  In the mail buffer, you can insert and edit header fields using
+ordinary editing commands.  Mail mode provides a commands to help you
+edit some header fields, and some are preinitialized in the buffer
+automatically when appropriate.
 
   The line in the buffer that says
 
@@ -110,7 +111,7 @@ headers precede it.  The delimiter line itself does not appear in the
 message actually sent.  The text used for the delimiter line is controlled
 by the variable @code{mail-header-separator}.
 
-Here is an example of what the headers and text in the mail buffer
+  Here is an example of what the headers and text in the mail buffer
 might look like.
 
 @example
@@ -221,7 +222,7 @@ of places to send the message.  These fields can also have
 continuation lines: one or more lines starting with whitespace,
 following the starting line of the field, are considered part of the
 field.  Here's an example of a @samp{To} field with a continuation
-line:@refill
+line:
 
 @example
 @group
@@ -239,11 +240,11 @@ yourself, Emacs puts in one for you.  The variable
 @item nil
 Use just the email address, as in @samp{king@@grassland.com}.
 @item parens
-Use both email address and full name, as in @samp{king@@grassland.com (Elvis
-Parsley)}.
+Use both email address and full name, as in:@*
+@samp{king@@grassland.com (Elvis Parsley)}.
 @item angles
-Use both email address and full name, as in @samp{Elvis Parsley
-<king@@grassland.com>}.
+Use both email address and full name, as in:@*
+@samp{Elvis Parsley <king@@grassland.com>}.
 @item system-default
 Allow the system to insert the @samp{From} field.
 @end table
@@ -300,8 +301,8 @@ alias chief-torturer "George W. Bush <bush@@whitehouse.gov>"
 @end example
 
 @noindent
-is correct.  Emacs will insert the address as @samp{"George W. Bush"
-<bush@@whitehouse.gov>}.
+is correct in @samp{.mailrc}.  Emacs will insert the address as
+@samp{"George W. Bush" <bush@@whitehouse.gov>}.
 
   Emacs also recognizes ``include'' commands in @samp{.mailrc} files.
 They look like this:
@@ -376,11 +377,11 @@ expansion as well.  Here's how to do that:
 
 @smallexample
 (add-hook 'mail-mode-hook
-          (lambda ()
-            (define-key
-              mail-mode-map [remap next-line] 'mail-abbrev-next-line)
-            (define-key
-              mail-mode-map [remap end-of-buffer] 'mail-abbrev-end-of-buffer)))
+    (lambda ()
+      (define-key
+        mail-mode-map [remap next-line] 'mail-abbrev-next-line)
+      (define-key
+        mail-mode-map [remap end-of-buffer] 'mail-abbrev-end-of-buffer)))
 @end smallexample
 
 @node Mail Mode
@@ -433,9 +434,8 @@ lowest priority for reselection by default, since you are finished with
 using it.  This is the usual way to send the message.
 
   In a file-visiting buffer, sending the message does not clear the
-modified flag, because only saving the file should do that.  As a
-result, you don't get a warning if you try to send the same message
-twice.
+modified flag, because only saving the file should do that.  Also, you
+don't get a warning if you try to send the same message twice.
 
 @c This is indexed in mule.texi, node "Recognize Coding".
 @c @vindex sendmail-coding-system
@@ -459,9 +459,9 @@ user agent sends mail.  It should be set to a function.  The default
 is @code{sendmail-send-it}, which delivers mail using the Sendmail
 installation on the local host.  To send mail through a SMTP server,
 set it to @code{smtpmail-send-it} and set up the Emacs SMTP library
-(@pxref{Top,, Sending mail via SMTP,smtpmail}).  A third option is
-@code{feedmail-send-it}, see the commentary section of the
-@file{feedmail.el} package for more information.
+(@pxref{Top,,Emacs SMTP Library, smtpmail, Sending mail via SMTP}).  A
+third option is @code{feedmail-send-it}, see the commentary section of
+the @file{feedmail.el} package for more information.
 
 @node Header Editing
 @subsection Mail Header Editing