Merge from origin/emacs-24

1a941d6 Fix incorrect usage of @key in the User Manual  (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
2fdec80 Improve indexing in Emacs manual  (Bug#20105)
cc11321 Fix --no-bitmap-icon

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/misc/ChangeLog
	src/ChangeLog

1 files changed, 9 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index fc85bd97f73..62f565191dc 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * efaq-w32.texi: Remove outdated information and update.
+
+2015-03-18  Martin Rudalics  <rudalics@gmx.at>
+
+        * efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110).
+
 2015-03-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (External methods) <adb>: Explain, when Tramp
@@ -12,7 +20,7 @@
 
         * erc.texi (Advanced Usage, Options): Add descriptions and examples
         for erc-format-nick-function and erc-rename-buffers options.
-        (Connecting): fix typo
+        (Connecting): Fix typo
 
 2015-03-02  Daniel Colascione  <dancol@dancol.org>