[Emacs-diffs] /srv/bzr/emacs/trunk r105014: Update doc string of `smtpmail-stream-type'.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105014
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-07 16:54:12 +0200
message:
  Update doc string of `smtpmail-stream-type'.
  
  * mail/smtpmail.el (smtpmail-stream-type): Note that `plain' can
  be used.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-07 10:35:43 +0000
+++ b/lisp/ChangeLog    2011-07-07 14:54:12 +0000
@@ -1,3 +1,8 @@
+2011-07-07  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-stream-type): Note that `plain' can
+       be used.
+
 2011-07-07  Richard Stallman  <address@hidden>
 
        * mail/rmail.el (rmail-next-error-move): Use `compilation-message'

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-07-06 21:34:13 +0000
+++ b/lisp/mail/smtpmail.el     2011-07-07 14:54:12 +0000
@@ -98,13 +98,14 @@
 
 (defcustom smtpmail-stream-type nil
   "Connection type SMTP connections.
-This may be either nil (plain connection) or `starttls' (use the
-starttls mechanism to turn on TLS security after opening the
-stream)."
+This may be either nil (possibly upgraded to STARTTLS if
+possible), or `starttls' (refuse to send if STARTTLS isn't
+available), or `plain' (never use STARTTLS).."
   :version "24.1"
   :group 'smtpmail
-  :type '(choice (const :tag "Plain" nil)
-                (const starttls)))
+  :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)
+                (const :tag "Always use STARTTLS" starttls)
+                (const :tag "Never use STARTTLS" plain)))
 
 (defcustom smtpmail-sendto-domain nil
   "Local domain name without a host name.