Merge branch 'emacs-24'

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e608248b2630507cf1a8305f8d284c9f571166ea..1ce7aa15aeccf998174fe813a6987a48b709e240 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-16  Tassilo Horn  <tsdh@gnu.org>
+
+       * misc.texi (DocView Slicing): Describe how to slice with the
+       mouse.  Fix command mentioned by slice by BoundingBox paragraph.
+       (Bug#18040)
+
 2014-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * misc.texi (Network Security): Use "untrustworthy" instead of