Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 44 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 71ecf7fad39..0677e441b83 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-27  Ivan Shmakov  <ivan@siamics.net>
+
+        * NEWS: Mention the new tar-new-entry command.  (Bug#19274)
+
+2015-01-27  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+        * NEWS: Document EUDC improvements.
+
 2015-01-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * publicsuffix.txt: Install an updated version of the file from
diff --git a/etc/NEWS b/etc/NEWS
index d5baed3dae7..4b0a268d8f2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -495,6 +495,42 @@ As a result of the above, these commands are now obsolete:
 `find-tag-other-window', `find-tag-other-frame', `find-tag-regexp',
 `tags-apropos' and `tags-loop-continue'.
 
+** EUDC
+EUDC's LDAP backend has been improved.
+
+*** EUDC supports LDAP-over-SSL URLs (ldaps://).
+
+*** EUDC passes LDAP passwords through a pipe to the ldapsearch
+subprocess instead of on the command line.
+
+*** EUDC handles LDAP wildcards automatically so the user shouldn't
+need to configure this manually anymore.
+
+*** The LDAP configuration section of EUDC's manual has been
+rewritten.
+
+There have also been customization changes.
+
+*** New custom variable `eudc-server-hotlist' to allow specifying
+multiple EUDC servers in init file.
+
+*** Custom variable `eudc-inline-query-format' defaults to completing
+on email and firstname instead of surname.
+
+*** Custom variable `eudc-expansion-overwrites-query' defaults to nil
+to avoid interfering with the kill ring.
+
+*** Custom variable `eudc-inline-expansion-format' defaults to
+"Firstname Surname <mail-address>".
+
+*** New custom variable `ldap-ldapsearch-password-prompt-regexp' to
+allow overriding the regular expression that recognizes the ldapsearch
+command line's password prompt.
+
++++
+** tar-mode: new `tar-new-entry' command, allowing for new members to
+be added to the archive.
+
 ** Obsolete packages
 
 ---