aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-24 18:29:47 +0100
committerLars Magne Ingebrigtsen2014-11-24 18:30:01 +0100
commite22f5c07d8bf514283221f337afb1ef7ca1cd2b8 (patch)
tree91196adce8b26025e3179d371c382043d8b4d04c /etc
parentb3b0b0971db990a39d1bf521a5c9dc604111ea89 (diff)
downloademacs-e22f5c07d8bf514283221f337afb1ef7ca1cd2b8.tar.gz
emacs-e22f5c07d8bf514283221f337afb1ef7ca1cd2b8.zip
Moved the Network Security Manager to the Emacs manual
* misc.texi (Gnus Summary Buffer): Moved the Network Security Manager stuff here from the lispref manual.
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS4
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 867e4f5f09c..5d616129ad0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * NEWS: Mention NSM.
4
12014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> 52014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * NEWS: Mention `url-request-noninteractive'. 7 * NEWS: Mention `url-request-noninteractive'.
diff --git a/etc/NEWS b/etc/NEWS
index da2edb66e42..6cad6a37c1b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -49,6 +49,10 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
49 49
50* Changes in Emacs 25.1 50* Changes in Emacs 25.1
51 51
52** Network security (TLS/SSL certificate validity and the like) is
53added via the new Network Security Manager (NSM) and controlled via
54the `network-security-level' variable.
55
52** C-h l now also lists the commands that were run. 56** C-h l now also lists the commands that were run.
53 57
54** The new M-s M-w key binding uses eww to search the web for the 58** The new M-s M-w key binding uses eww to search the web for the