Backport from trunk documentation of shr-color-visible-* variables.

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

diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 67824afb898fcc5f5d99697d17bde38088f02353..cb22dc87d2a2e589020576f37628e5fc0cdd4ffd 100644 (file)
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -1,22 +1,21 @@
 \input texinfo  @c -*-texinfo-*-
 @setfilename ../../info/smtpmail
 @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''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -26,9 +25,9 @@ developing GNU and promoting software freedom.''
 @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
@@ -72,8 +71,8 @@ not necessarily involve SMTP, however.  Here is short overview of what
 is involved.
 
 @cindex MUA
-   The mail program --- also called a mail user agent (MUA) ---
-usually sends outgoing mail to a mail host.  When your computer is
+   The mail program---also called a mail user agent (MUA)---usually
+sends outgoing mail to a mail host.  When your computer is
 permanently connected to the internet, it might even be a mail host
 itself.  In this case, the MUA will pipe mail to the
 @file{/usr/lib/sendmail} application.  It will take care of your mail
@@ -285,8 +284,8 @@ The variable @code{smtpmail-stream-type} controls what form of
 connection the SMTP library uses.  The default value is @code{nil},
 which means to use a plain connection, but try to switch to a STARTTLS
 encrypted connection if the server supports it.  Other possible values
-are: @code{starttls} - insist on STARTTLS; @code{ssl} - use TLS/SSL;
-and @code{plain} - no encryption.
+are: @code{starttls} to insist on STARTTLS; @code{ssl} to use TLS/SSL;
+and @code{plain} for encryption.
 
 Use of any form of TLS/SSL requires support in Emacs.  You can either
 use the built-in support (in Emacs 24.1 and later), or the
@@ -410,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.