Merge from trunk.

[bpt/emacs.git] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index e5157fd..69e04cf 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,8 +60,11 @@ character when doing minibuffer filename prompts.
 ** which-function-mode now applies to all applicable major modes by default.
 
 ** erc will look up server/channel names via auth-source and use the
-   channel keys found, if any.
+channel keys found, if any.
 
+** The `server-auth-key' variable can be used to set a permanent
+shared key for Emacs Server.
+   
 ** Obsolete packages:
 
 *** mailpost.el