; Document choice of smtp authentication method

* doc/misc/smtpmail.texi (Authentication): Document smtp-auth.
* etc/NEWS: Advertise the feature.

diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index f29a5a82e86090e5017157c135c5d2c8ffe90182..18c76fb88985bb1dd02390e9acdcb1c2dedff6ef 100644 (file)
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -267,10 +267,11 @@ file, @pxref{Top,,auth-source, auth, Emacs auth-source Library}.
 The process by which the SMTP library authenticates you to the server
 is known as ``Simple Authentication and Security Layer'' (SASL).
 There are various SASL mechanisms, and this library supports three of
-them: CRAM-MD5, PLAIN, and LOGIN@.  It tries each of them, in that order,
-until one succeeds.  The first uses a form of encryption to obscure
-your password, while the other two do not.
-
+them: CRAM-MD5, PLAIN, and LOGIN@, where the first uses a form of
+encryption to obscure your password, while the other two do not.  It
+tries each of them, in that order, until one succeeds.  You can assign
+a specific authentication mechanism to a server by including a key
+smtp-auth with a value of the preferred mechanism.
 
 @node Encryption
 @chapter Encryption

diff --git a/etc/NEWS b/etc/NEWS
index 9a044cade1cb966261a7c0ef0c4b72f5ce18ad55..1cb1b7ee4fd1135061e9a1f19e540b9a65c9c9d8 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -379,6 +379,14 @@ In Message mode buffers, the 'C-c C-p' ('message-insert-screenshot')
 command has been added.  It depends on using an external program to
 take the actual screenshot, and defaults to "ImageMagick import".
 
+
+** Smtpmail
+
++++
+*** Allow direct selection of smtp authentication mechanism.
+A server entry retrieved by auth-source can request a desired smtp
+authentication mechanism by setting a value for the key 'smtp-auth'.
+
 ** Help
 
 +++