Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a9c4995d49b6a34c9b5198c526f8943d3b834552..a1d2688470d7666d71c2bf555f33153095ddadd2 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-21  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)
+
 2014-07-09  Juri Linkov  <juri@jurta.org>
 
        * search.texi (Regexp Search): Update lax space matching that is