[Emacs-diffs] emacs-25 eaa0058: Improve documentation of 'gnutls-verify-error'

[Eli Zaretskii]

branch: emacs-25
commit eaa00584ceb30fd1170bf06f2514f3b6e4192329
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Improve documentation of 'gnutls-verify-error'
    
    * lisp/net/gnutls.el (gnutls-verify-error): Improve and expand
    doc string.  (Bug#26845)
---
 lisp/net/gnutls.el | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 02b5895..7e7521d 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -52,7 +52,27 @@ set this variable to \"normal:-dhe-rsa\"."
                  string))
 
 (defcustom gnutls-verify-error nil
-  "If non-nil, this should be a list of checks per hostname regex or t."
+  "If non-nil, this should be t or a list of checks per hostname regex.
+If nil, the default, failures in certificate verification will be
+logged (subject to `gnutls-log-level'), but the connection will be
+allowed to proceed.
+If the value is a list, it should have the form
+
+   ((HOST-REGEX FLAGS...) (HOST-REGEX FLAGS...) ...)
+
+where each HOST-REGEX is a regular expression to be matched
+against the hostname, and FLAGS is either t or a list of
+one or more verification flags.  The supported flags and the
+corresponding conditions to be tested are:
+
+  :trustfiles -- certificate must be issued by a trusted authority.
+  :hostname   -- hostname must match presented certificate's host name.
+  t           -- all of the above conditions are tested.
+
+If the condition test fails, an error will be signaled.
+
+If the value of this variable is t, every connection will be subjected
+to all of the tests described above."
   :group 'gnutls
   :version "24.4"
   :type '(choice