Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

1 files changed, 21 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0bf989c75d4..d4bd5e43acb 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,24 @@
+2014-06-08  Karl Berry  <karl@gnu.org>
+
+        * doc/info.texi (Help-^L): "mode line", "screenful",
+        stand-alone and Emacs Info both use the mode line.
+        Use x instead of weird C-x 0 to get rid of help msg
+        in standalone Info.
+
+2014-06-08  Glenn Morris  <rgm@gnu.org>
+
+        * vip.texi (Files): Defer to Emacs manual for uniquify details.
+
+        * info.texi (Help-Small-Screen): Clarify details of S-SPC.
+        (Help-Small-Screen, Help-]): Do not mention S-SPC.
+        (Emacs Info Variables): Markup fix.
+
+        * ebrowse.texi (Source Display, Finding/Viewing):
+        * erc.texi (Sample Session):
+        * ses.texi (The Basics):
+        * todo-mode.texi (Moving and Deleting Items):
+        * woman.texi (Navigation): Markup fixes re SPC, RET.
+
 2014-06-02  Glenn Morris  <rgm@gnu.org>
 
         * efaq.texi (Finding a package with particular functionality):