diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
| commit | 5feeead12693cd97c6d77b14ef05d29ba5cf18bb (patch) | |
| tree | 94d4e8ab4586c3a247a95cf43d2eec482dfc0b04 /doc/misc | |
| parent | 14649c889083ba9cc685846e508864830bdc0c9f (diff) | |
| parent | 604f6568312aef8287d7a3ac1dbeb71577089bec (diff) | |
Merge from origin/emacs-25
604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/smtpmail.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 2647331167..d9a68c4598 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -285,7 +285,7 @@ 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} to insist on STARTTLS; @code{ssl} to use TLS/SSL; -and @code{plain} for encryption. +and @code{plain} for no 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 |