lisp/net/{eudc,ldap}: Merge branch streamline-eudc-configuration

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3ae626f49ef3a5b81bdd86b6487ab64225269101..e75589f92ecce7128001d66902e431efc227c99a 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-23  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+       * eudc.texi (LDAP Configuration): Rename from LDAP Requirements
+       and provide configuration examples.
+
+2015-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * eieio.texi (Slot Options): Document :protection as unsupported.
+
 2015-01-01  Michael Albinus  <michael.albinus@gmx.de>
 
        Sync with Tramp 2.2.11.
@@ -12,10 +21,20 @@
        (${buildinfodir}/efaq%.info, efaq%.html):
        Use them.
 
+2014-12-31  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+       * info.texi (Create Info buffer): Mention info-display-manual prefix.
+
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * efaq.texi (Displaying the current file name in the titlebar):
+       Prefer (system-name) to system-name.
+       * smtpmail.texi (Server workarounds): Fix grammar.
+
 2014-12-18  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
-       * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention
-       gnus-registry-prune-factor. Explain sorting changes and
+       * gnus.texi (Gnus Registry Setup): Explain pruning changes.
+       Mention gnus-registry-prune-factor. Explain sorting changes and
        gnus-registry-default-sort-function. Correct file extension.
 
 2014-12-17  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -12024,7 +12043,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.