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

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 260656c6cf7..3644d40fabf 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
+
 2015-03-09  Nicolas Petton <nicolas@petton.fr>
 
         * sequences.texi (seq-into): Add documentation for the new
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 4fec757393f..24c7559c7d9 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -723,7 +723,7 @@ just one matching completion, and the match is exact, it returns
 @code{t}.  Otherwise, it returns the longest initial sequence common
 to all possible matching completions.
 
-If @var{collection} is an list, the permissible completions are
+If @var{collection} is a list, the permissible completions are
 specified by the elements of the list, each of which should be either
 a string, or a cons cell whose @sc{car} is either a string or a symbol
 (a symbol is converted to a string using @code{symbol-name}).  If the