2006-09-06 Simon Josefsson <jas@extundo.com>

	* smtpmail.texi (Authentication): Mention SSL.

2 files changed, 10 insertions, 4 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 388800b99ae..7d7fb35c97b 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-06  Simon Josefsson  <jas@extundo.com>
+
+        * smtpmail.texi (Authentication): Mention SSL.
+
 2006-09-01  Eli Zaretskii  <eliz@gnu.org>
 
         * rcirc.texi (Internet Relay Chat, Useful IRC commands): Don't use
diff --git a/man/smtpmail.texi b/man/smtpmail.texi
index 792a7934f95..b32185e5305 100644
--- a/man/smtpmail.texi
+++ b/man/smtpmail.texi
@@ -209,6 +209,8 @@ The following example illustrates what you could put in
 @cindex CRAM-MD5
 @cindex LOGIN
 @cindex STARTTLS
+@cindex TLS
+@cindex SSL
 Many environments require SMTP clients to authenticate themselves
 before they are allowed to route mail via a server.  The two following
 variables contains the authentication information needed for this.
@@ -220,10 +222,10 @@ that order if the server support both.
 The second variable, @code{smtpmail-starttls-credentials}, instructs
 the SMTP library to connect to the server using STARTTLS.  This means
 the protocol exchange may be integrity protected and confidential by
-using TLS, and optionally also authentication of the client.  This
-feature uses the elisp package @file{starttls.el} (see it for more
-information on customization), which in turn require that at least one
-of the following external tools are installed:
+using TLS, also known as SSL, and optionally also authentication of
+the client.  This feature uses the elisp package @file{starttls.el}
+(see it for more information on customization), which in turn require
+that at least one of the following external tools are installed:
 
 @enumerate
 @item