aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-12-08 20:06:50 +0100
committerLars Magne Ingebrigtsen2014-12-08 20:06:50 +0100
commit6b1ab80ef9b65c08e53edc7fa8ec4418da296ca7 (patch)
treea5968b2edcf04dcdd6c10953c4556986875a841c
parentca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd (diff)
downloademacs-6b1ab80ef9b65c08e53edc7fa8ec4418da296ca7.tar.gz
emacs-6b1ab80ef9b65c08e53edc7fa8ec4418da296ca7.zip
`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.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/nsm.el21
2 files changed, 12 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ca7c87ad94..d40b56f71e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12014-12-08 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * net/nsm.el (network-security-level): Remove the detailed
4 description, which was already outdated, and refer the users to
5 the manual.
6
12014-12-06 Andrey Kotlarski <m00naticus@gmail.com> 72014-12-06 Andrey Kotlarski <m00naticus@gmail.com>
2 8
3 * net/eww.el (eww-buffers-mode): New major mode. 9 * net/eww.el (eww-buffers-mode): New major mode.
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 067de556b67..5bc32b4f081 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -43,22 +43,13 @@ connection should be handled.
43The following values are possible: 43The following values are possible:
44 44
45`low': Absolutely no checks are performed. 45`low': Absolutely no checks are performed.
46`medium': This is the default level, should be reasonable for most usage.
47`high': This warns about additional things that many people would
48not find useful.
49`paranoid': On this level, the user is queried for most new connections.
46 50
47`medium': This is the default level, and the following things will 51See the Emacs manual for a description of all things that are
48be prompted for. 52checked and warned against."
49
50* invalid, self-signed or otherwise unverifiable certificates
51* whether a previously accepted unverifiable certificate has changed
52* when a connection that was previously protected by STARTTLS is
53 now unencrypted
54
55`high': In addition to the above.
56
57* any certificate that changes its public key
58
59`paranoid': In addition to the above.
60
61* any new certificate that you haven't seen before"
62 :version "25.1" 53 :version "25.1"
63 :group 'nsm 54 :group 'nsm
64 :type '(choice (const :tag "Low" low) 55 :type '(choice (const :tag "Low" low)