Merge from origin/emacs-24

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

diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 6a2dc5051969f5ce4e839e2307cbf0ae1851149f..f539cd0e2247ecabeb86da10a01c1e92ec717c78 100644 (file)
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -1,15 +1,16 @@
 \input texinfo  @c -*-texinfo-*-
-@setfilename ../../info/smtpmail
+@setfilename ../../info/smtpmail.info
 @settitle Emacs SMTP Library
+@documentencoding UTF-8
 @syncodeindex vr fn
 @copying
-Copyright @copyright{} 2003--2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2003--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
@@ -24,9 +25,9 @@ modify this GNU manual.''
 @end direntry
 
 @titlepage
-@title{Emacs SMTP Library}
-@subtitle{An Emacs package for sending mail via SMTP}
-@author{Simon Josefsson, Alex Schroeder}
+@title Emacs SMTP Library
+@subtitle An Emacs package for sending mail via SMTP
+@author Simon Josefsson, Alex Schroeder
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -408,7 +409,7 @@ clues to the reason for the error.
 @vindex smtpmail-debug-info
   The variable @code{smtpmail-debug-info} controls whether to print
 the SMTP protocol exchange in the minibuffer, and retain the entire
-exchange in a buffer @samp{*trace of SMTP session to @var{server}*},
+exchange in a buffer @file{*trace of SMTP session to @var{server}*},
 where @var{server} is the name of the mail server to which you send
 mail.