merge trunk

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 47a4c8d..873681a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,19 @@
+2012-10-17  Glenn Morris  <rgm@gnu.org>
+
+       * mini.texi (Repetition): Further copyedit.
+
+2012-10-17  Dani Moncayo  <dmoncayo@gmail.com>
+
+       * mini.texi (Repetition): Copyedit.
+
+2012-10-16  Juri Linkov  <juri@jurta.org>
+
+       * search.texi (Query Replace): Document multi-buffer replacement
+       keys.  (Bug#12655)
+
+       * maintaining.texi (Tags Search): Change link "Replace" to
+       "Query Replace".
+
 2012-10-13  Chong Yidong  <cyd@gnu.org>
 
        * files.texi (File Conveniences): ImageMagick enabled by default.