[Emacs-diffs] master 6b1ab80 1/2: `network-security-level' documentation simplification

[Lars Ingebrigtsen]

branch: master
commit 6b1ab80ef9b65c08e53edc7fa8ec4418da296ca7
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    `network-security-level' documentation simplification
    
    * lisp/net/nsm.el (network-security-level): Remove the detailed
    description, which was already outdated, and refer the users to
    the manual.
---
 lisp/ChangeLog  |    6 ++++++
 lisp/net/nsm.el |   21 ++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ca7c87..d40b56f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-08  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/nsm.el (network-security-level): Remove the detailed
+       description, which was already outdated, and refer the users to
+       the manual.
+
 2014-12-06  Andrey Kotlarski  <address@hidden>
 
        * net/eww.el (eww-buffers-mode): New major mode.
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 067de55..5bc32b4 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -43,22 +43,13 @@ connection should be handled.
 The following values are possible:
 
 `low': Absolutely no checks are performed.
+`medium': This is the default level, should be reasonable for most usage.
+`high': This warns about additional things that many people would
+not find useful.
+`paranoid': On this level, the user is queried for most new connections.
 
-`medium': This is the default level, and the following things will
-be prompted for.
-
-* invalid, self-signed or otherwise unverifiable certificates
-* whether a previously accepted unverifiable certificate has changed
-* when a connection that was previously protected by STARTTLS is
-  now unencrypted
-
-`high': In addition to the above.
-
-* any certificate that changes its public key
-
-`paranoid': In addition to the above.
-
-* any new certificate that you haven't seen before"
+See the Emacs manual for a description of all things that are
+checked and warned against."
   :version "25.1"
   :group 'nsm
   :type '(choice (const :tag "Low" low)