Merge from origin/emacs-24

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d2f7a345566539e2f738c6100b38598ecf2ff8d0..b9ca8b39fd30baded1845059972f33f18fc96026 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * buffers.texi (Kill Buffer): Improve indexing.
+
+2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+2014-12-24  Stephen Leake  <stephen_leake@stephe-leake.org>
+
+       * trouble.texi: Move user-level information from CONTRIBUTE here.
+
 2014-12-14  Alan Mackenzie  <acm@muc.de>
 
        * display.texi (Scrolling): fast-but-imprecise-scrolling.