Merge from trunk.

[gnu-emacs] / doc / misc / smtpmail.texi

diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 457293a4d215c60216a9f169e72dc1d899cc582e..1d4bbbff4ac58093dc56820aa566852ef62285dc 100644 (file)
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -3,7 +3,7 @@
 @settitle Emacs SMTP Library
 @syncodeindex vr fn
 @copying
-Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright @copyright{} 2003-2011
 Free Software Foundation, Inc.
 
 @quotation
@@ -20,9 +20,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs lisp libraries
 @direntry
-* SMTP: (smtpmail). Emacs library for sending mail via SMTP.
+* SMTP: (smtpmail).             Emacs library for sending mail via SMTP.
 @end direntry
 
 @titlepage
@@ -355,15 +355,15 @@ configurations of sendmail requires this behavior.  Don't bother to
 set this unless you have get an error like:
 
 @example
-       Sending failed; SMTP protocol error
+        Sending failed; SMTP protocol error
 @end example
 
 when sending mail, and the debug buffer (@pxref{Debugging})) contains
 an error such as:
 
 @example
-       RCPT TO: @var{someone}
-       501 @var{someone}: recipient address must contain a domain
+        RCPT TO: @var{someone}
+        501 @var{someone}: recipient address must contain a domain
 @end example
 
 @end table
@@ -415,7 +415,3 @@ cannot accept mail.
 @printindex fn
 
 @bye
-
-@ignore
-   arch-tag: 6316abdf-b366-4562-87a2-f37e8f894b6f
-@end ignore