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 f13879eaa08c831e8151b363ae0695418d99075b..59d4280e789af1a90389d036fac58a36e6e16d61 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,22 @@
+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.
+
+2014-10-04  Glenn Morris  <rgm@gnu.org>
+
+       * cmdargs.texi (Misc X):
+       * display.texi (Optional Mode Line):
+       * misc.texi (emacsclient Options):
+       * vc1-xtra.texi (VC Delete/Rename): Small fixes re @var usage.
+
+       * killing.texi (Rectangles): Copyedits re rectangle-mark-mode.
+       (CUA Bindings): Mention rectangle-mark-mode.
+
 2014-10-03  Martin Rudalics  <rudalics@gmx.at>
 
        * frames.texi (Frame Commands):