Merge from origin/emacs-24

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d969b8e2b072d231383cdbc471185aeeb2e463aa..b9ca8b39fd30baded1845059972f33f18fc96026 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,22 @@
+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.
+       Describe new variable.
+
+2014-12-14  Cameron Desautels  <camdez@gmail.com>
+
+       * custom.texi (Saving Customizations): Mention
+       `custom-prompt-customize-unsaved-options'.
+
 2014-12-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * misc.texi (Network Security): Mention the new protocol-level
@@ -5,7 +24,7 @@
 
 2014-12-08  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-       * maintaining.texi: Suopport fo Arch has been moved to obolte,
+       * maintaining.texi: Suopport fo Arch has been moved to obosolete,
        remove references that imply otherwise.
 
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>