Merge from origin/emacs-24

[gnu-emacs] / doc / emacs / mini.texi

diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index ebccedacc05523ed38724513a5cda6e3b7a41076..2a86af3ec2f15a24bd6a3365e31a5fecca3f9b2c 100644 (file)
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software
+@c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Minibuffer
 @chapter The Minibuffer
@@ -37,7 +37,7 @@ how it will be used.  The prompt is highlighted using the
   The simplest way to enter a minibuffer argument is to type the text,
 then @key{RET} to submit the argument and exit the minibuffer.
 Alternatively, you can type @kbd{C-g} to exit the minibuffer by
-cancelling the command asking for the argument (@pxref{Quitting}).
+canceling the command asking for the argument (@pxref{Quitting}).
 
 @cindex default argument
   Sometimes, the prompt shows a @dfn{default argument}, inside
@@ -357,12 +357,12 @@ While in the completion list buffer, this chooses the completion at
 point (@code{choose-completion}).
 
 @findex next-completion
-@item @key{Right}
+@item @key{RIGHT}
 While in the completion list buffer, this moves point to the following
 completion alternative (@code{next-completion}).
 
 @findex previous-completion
-@item @key{Left}
+@item @key{LEFT}
 While in the completion list buffer, this moves point to the previous
 completion alternative (@code{previous-completion}).
 @end table
@@ -550,6 +550,9 @@ previous example, @samp{foo.e} completes to @samp{foo.elc}.  Emacs
 disregards @code{completion-ignored-extensions} when showing
 completion alternatives in the completion list.
 
+  Shell completion is an extended version of filename completion,
+@pxref{Shell Options}.
+
 @vindex completion-auto-help
   If @code{completion-auto-help} is set to @code{nil}, the completion
 commands never display the completion list buffer; you must type
@@ -572,13 +575,6 @@ in a cyclic manner.  If you give @code{completion-cycle-threshold} a
 numeric value @var{n}, completion commands switch to this cycling
 behavior only when there are @var{n} or fewer alternatives.
 
-@cindex Icomplete mode
-@findex icomplete-mode
-  Icomplete mode presents a constantly-updated display that tells you
-what completions are available for the text you've entered so far.  The
-command to enable or disable this minor mode is @kbd{M-x
-icomplete-mode}.
-
 @node Minibuffer History
 @section Minibuffer History
 @cindex minibuffer history
@@ -591,11 +587,11 @@ argument into the minibuffer:
 
 @table @kbd
 @item M-p
-@itemx @key{Up}
+@itemx @key{UP}
 Move to the previous item in the minibuffer history, an earlier
 argument (@code{previous-history-element}).
 @item M-n
-@itemx @key{Down}
+@itemx @key{DOWN}
 Move to the next item in the minibuffer history
 (@code{next-history-element}).
 @item M-r @var{regexp} @key{RET}
@@ -612,11 +608,11 @@ Move to a later item in the minibuffer history that matches
 @kindex DOWN @r{(minibuffer history)}
 @findex next-history-element
 @findex previous-history-element
-  While in the minibuffer, @kbd{M-p} or @key{Up}
+  While in the minibuffer, @kbd{M-p} or @key{UP}
 (@code{previous-history-element}) moves through the minibuffer history
 list, one item at a time.  Each @kbd{M-p} fetches an earlier item from
 the history list into the minibuffer, replacing its existing contents.
-Typing @kbd{M-n} or @key{Down} (@code{next-history-element}) moves
+Typing @kbd{M-n} or @key{DOWN} (@code{next-history-element}) moves
 through the minibuffer history list in the opposite direction,
 fetching later entries into the minibuffer.