Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4014725adf06b037a24286a341a5569a05d06ed7..59d4280e789af1a90389d036fac58a36e6e16d61 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,11 @@
+2014-10-05  Glenn Morris  <rgm@gnu.org>
+
+       * misc.texi (Sorting):
+       * search.texi (Query Replace): Markup fixes.
+
 2014-10-04  Martin Rudalics  <rudalics@gmx.at>
 
-       * frames.texi (Scroll Bars): Describe use of horizontal scroll
-       bars.
+       * frames.texi (Scroll Bars): Describe use of horizontal scroll bars.
 
 2014-10-04  Glenn Morris  <rgm@gnu.org>