* gnus-msg.el (gnus-copy-article-buffer): Quote decoded words containing

[gnus] / lisp / starttls.el

diff --git a/lisp/starttls.el b/lisp/starttls.el
index cfa6a41..f2b72fb 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -37,9 +37,11 @@
 ;; and the second one is Simon Josefsson's starttls.el which uses
 ;; "gnutls-cli" from GNUTLS.
 ;;
-;; If "gnutls-cli" is available, it is prefered by the code over
-;; "starttls".  Use `starttls-use-gnutls' to toggle between
-;; implementations if you have both tools installed.
+;; If "starttls" is available, it is prefered by the code over
+;; "gnutls-cli", for backwards compatibility.  Use
+;; `starttls-use-gnutls' to toggle between implementations if you have
+;; both tools installed.  It is recommended to use GNUTLS, though, as
+;; it performs more verification of the certificates.
 
 ;; The GNUTLS support require GNUTLS 0.9.90 (released 2003-10-08) or
 ;; later, from <http://www.gnu.org/software/gnutls/>, or "starttls"
@@ -124,6 +126,7 @@
   "Name of GNUTLS command line tool.
 This program is used when GNUTLS is used, i.e. when
 `starttls-use-gnutls' is non-nil."
+  :version "22.1"
   :type 'string
   :group 'starttls)
 
@@ -136,6 +139,7 @@ i.e. when `starttls-use-gnutls' is nil."
 
 (defcustom starttls-use-gnutls (not (executable-find starttls-program))
   "*Whether to use GNUTLS instead of the `starttls' command."
+  :version "22.1"
   :type 'boolean
   :group 'starttls)
 
@@ -154,11 +158,13 @@ This program is used when GNUTLS is used, i.e. when
 For example, non-TLS compliant servers may require
 '(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
 find out which parameters are available."
+  :version "22.1"
   :type '(repeat string)
   :group 'starttls)
 
 (defcustom starttls-process-connection-type nil
   "*Value for `process-connection-type' to use when starting STARTTLS process."
+  :version "22.1"
   :type 'boolean
   :group 'starttls)
 
@@ -168,6 +174,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; GNUTLS cli.c:main() print this string when it is starting to run
   ;; in the application read/write phase.  If the logic, or the string
   ;; itself, is modified, this must be updated.
+  :version "22.1"
   :type 'regexp
   :group 'starttls)
 
@@ -176,6 +183,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
 The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; GNUTLS cli.c:do_handshake() print this string on failure.  If the
   ;; logic, or the string itself, is modified, this must be updated.
+  :version "22.1"
   :type 'regexp
   :group 'starttls)
 
@@ -186,6 +194,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; common.c:print_info(), that unconditionally print this string
   ;; last.  If that logic, or the string itself, is modified, this
   ;; must be updated.
+  :version "22.1"
   :type 'regexp
   :group 'starttls)