Mercurial > emacs

--- a/doc/lispref/ChangeLog	Sun Jun 07 16:17:03 2009 +0000
+++ b/doc/lispref/ChangeLog	Sun Jun 07 20:45:49 2009 +0000
@@ -1,3 +1,9 @@
+2009-06-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* minibuf.texi (Reading File Names): Fix introductory text.
+	Suggested by stan@derbycityprints.com.
+	(High-Level Completion): Fix typo.
+
 2009-05-28  Chong Yidong  <cyd@stupidchicken.com>

 	* frames.texi (Text Terminal Colors): Multi-tty is already
--- a/doc/lispref/minibuf.texi	Sun Jun 07 16:17:03 2009 +0000
+++ b/doc/lispref/minibuf.texi	Sun Jun 07 20:45:49 2009 +0000
@@ -1317,7 +1317,7 @@
 except that empty color names are allowed when @code{allow-empty} is
 non-@code{nil} and the user enters null input.

-Interactively, or when @var{display} is non-@code{nill}, the return
+Interactively, or when @var{display} is non-@code{nil}, the return
 value is also displayed in the echo area.
 @end deffn

@@ -1330,9 +1330,11 @@
 @cindex read file names
 @cindex prompt for file name

-  Here is a couple of other high-level completion functions, designed
-for reading file names and shell commands.  They provide special
-features including automatic insertion of the default directory.
+  The high-level completion functions @code{read-file-name},
+@code{read-directory-name}, and @code{read-shell-command} are designed
+to read file names, directory names, and shell commands respectively.
+They provide special features, including automatic insertion of the
+default directory.

 @defun read-file-name prompt &optional directory default require-match initial predicate
 This function reads a file name in the minibuffer, prompting with