5 files changed, 87 insertions, 48 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 20f751f703f..2f3a4ee1680 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,22 @@
+2012-02-23  Glenn Morris  <rgm@gnu.org>
+
+        * mini.texi (Minibuffer File, Completion Options, Repetition):
+        Copyedits.
+        (Completion Example): Other M-x au* commands may be defined.
+        (Completion Styles): Mention emacs21 and completion-category-overrides.
+
+        * msdog.texi (Text and Binary, ls in Lisp, Windows HOME)
+        (Windows Keyboard, Windows Mouse, Windows Processes)
+        (Windows Printing, Windows Misc): Copyedits.
+        (ls in Lisp): Update switches list.
+
+        * msdog-xtra.texi (MS-DOS Display): Update list-colors-display xref.
+        Update dos-mode* function names.
+        (MS-DOS Printing, MS-DOS and MULE): Copyedits.
+        (MS-DOS Processes): Add xref to main ls-lisp section.
+
+        * ack.texi (Acknowledgments): Mention smie.
+
 2012-02-22  Glenn Morris  <rgm@gnu.org>
 
         * macos.texi: Copyedits.  Fix @key/@kbd usage.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 7bccc898d06..0a14f5119d1 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -833,9 +833,9 @@ text; @file{smerge-mode.el}, a minor mode for resolving @code{diff3}
 conflicts; @file{diff-mode.el}, a mode for viewing and editing context
 diffs; @file{css-mode.el} for Cascading Style Sheets;
 @file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a
-client for the ``Music Player Daemon''; and @file{pcase.el},
-implementing ML-style pattern matching.  He integrated the
-lexical binding code in Emacs 24.
+client for the ``Music Player Daemon''; @file{smie.el}, a generic
+indentation engine; and @file{pcase.el}, implementing ML-style pattern
+matching.  He integrated the lexical binding code in Emacs 24.
 
 @item
 Morioka Tomohiko wrote several packages for MIME support in Gnus and
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index ca8e8f705b4..e20d5a347cd 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -58,11 +58,11 @@ some initial text ending in a slash.  This is the @dfn{default
 directory}.  For example, it may start out like this:
 
 @example
-Find File: /u2/emacs/src/
+Find file: /u2/emacs/src/
 @end example
 
 @noindent
-Here, @samp{Find File:@: } is the prompt and @samp{/u2/emacs/src/} is
+Here, @samp{Find file:@: } is the prompt and @samp{/u2/emacs/src/} is
 the default directory.  If you now type @kbd{buffer.c} as input, that
 specifies the file @file{/u2/emacs/src/buffer.c}.  @xref{File Names},
 for information about the default directory.
@@ -79,7 +79,7 @@ name starting with a slash or a tilde after the default directory.
 For example, you can specify @file{/etc/termcap} as follows:
 
 @example
-Find File: /u2/emacs/src//etc/termcap
+Find file: /u2/emacs/src//etc/termcap
 @end example
 
 @noindent
@@ -247,7 +247,10 @@ completion.
 completion alternatives (in this case, command names) that start with
 @samp{au}.  There are several, including @code{auto-fill-mode} and
 @code{autoconf-mode}, but they all begin with @code{auto}, so the
-@samp{au} in the minibuffer completes to @samp{auto}.
+@samp{au} in the minibuffer completes to @samp{auto}.  (More commands
+may be defined in your Emacs session.  For example, if a command
+called @code{authorize-me} was defined, Emacs could only complete
+as far as @samp{aut}.)
 
   If you type @key{TAB} again immediately, it cannot determine the
 next character; it could be @samp{-}, @samp{a}, or @samp{c}.  So it
@@ -385,7 +388,7 @@ it just submits the argument as you have entered it.
 @item
 @dfn{Permissive completion with confirmation} is like permissive
 completion, with an exception: if you typed @key{TAB} and this
-completed the text up to some intermediate state (i.e. one that is not
+completed the text up to some intermediate state (i.e., one that is not
 yet an exact completion match), typing @key{RET} right afterward does
 not submit the argument.  Instead, Emacs asks for confirmation by
 momentarily displaying @samp{[Confirm]} after the text; type @key{RET}
@@ -450,8 +453,7 @@ position in the completion alternative.
 @item emacs22
 This completion style is similar to @code{basic}, except that it
 ignores the text in the minibuffer after point.  It is so-named
-because it corresponds to the completion behavior in Emacs 22 and
-earlier.
+because it corresponds to the completion behavior in Emacs 22.
 @end table
 
 @noindent
@@ -476,6 +478,18 @@ and initialisms.  For example, when completing command names, it
 matches @samp{lch} to @samp{list-command-history}.
 @end table
 
+@noindent
+There is also a very simple completion style called @code{emacs21}.
+In this style, if the text in the minibuffer is @samp{foobar},
+only matches starting with @samp{foobar} are considered.
+
+@vindex completion-category-overrides
+You can use different completion styles in different situations,
+by setting the variable @code{completion-category-overrides}.
+For example, the default setting says to use only @code{basic}
+and @code{substring} completion for buffer names.
+
+
 @node Completion Options
 @subsection Completion Options
 
@@ -521,7 +535,7 @@ commands never display the completion list buffer; you must type
 @kbd{?}  to display the list.  If the value is @code{lazy}, Emacs only
 shows the completion list buffer on the second attempt to complete.
 In other words, if there is nothing to complete, the first @key{TAB}
-echoes @samp{Next char not unique}; the second @key{TAB} does the
+echoes @samp{Next char not unique}; the second @key{TAB} shows the
 completion list buffer.
 
 @vindex completion-cycle-threshold
@@ -688,7 +702,7 @@ value.  @xref{Incremental Search}.
 @vindex command-history
   The list of previous minibuffer-using commands is stored as a Lisp
 list in the variable @code{command-history}.  Each element is a Lisp
-expression which describes one command and its arguments.  Lisp programs
+expression that describes one command and its arguments.  Lisp programs
 can re-execute a command by calling @code{eval} with the
 @code{command-history} element.
 
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi
index dc50b3d248f..509b9de754d 100644
--- a/doc/emacs/msdog-xtra.texi
+++ b/doc/emacs/msdog-xtra.texi
@@ -199,10 +199,10 @@ of Emacs packages that use fonts (such as @code{font-lock}, Enriched
 Text mode, and others) by defining the relevant faces to use different
 colors.  Use the @code{list-colors-display} command
 @iftex
-(@pxref{Frame Parameters,,,emacs, the Emacs Manual})
+(@pxref{Colors,,,emacs, the Emacs Manual})
 @end iftex
 @ifnottex
-(@pxref{Frame Parameters})
+(@pxref{Colors})
 @end ifnottex
 and the @code{list-faces-display} command
 @iftex
@@ -260,10 +260,10 @@ visible frame smaller than the full screen, but Emacs still cannot
 display more than a single frame at a time.
 
 @cindex frame size under MS-DOS
-@findex mode4350
-@findex mode25
-  The @code{mode4350} command switches the display to 43 or 50
-lines, depending on your hardware; the @code{mode25} command switches
+@findex dos-mode4350
+@findex dos-mode25
+  The @code{dos-mode4350} command switches the display to 43 or 50
+lines, depending on your hardware; the @code{dos-mode25} command switches
 to the default 80x25 screen size.
 
   By default, Emacs only knows how to set screen sizes of 80 columns by
@@ -394,7 +394,7 @@ different default values on MS-DOS.
 for details about setting up printing to a networked printer.
 
   Some printers expect DOS codepage encoding of non-@acronym{ASCII} text, even
-though they are connected to a Windows machine which uses a different
+though they are connected to a Windows machine that uses a different
 encoding for the same locale.  For example, in the Latin-1 locale, DOS
 uses codepage 850 whereas Windows uses codepage 1252.  @xref{MS-DOS and
 MULE}.  When you print to such printers from Windows, you can use the
@@ -483,7 +483,7 @@ appropriate terminal coding system that is supported by the codepage.
 The special features described in the rest of this section mostly
 pertain to codepages that encode ISO 8859 character sets.
 
-  For the codepages which correspond to one of the ISO character sets,
+  For the codepages that correspond to one of the ISO character sets,
 Emacs knows the character set based on the codepage number.  Emacs
 automatically creates a coding system to support reading and writing
 files that use the current codepage, and uses this coding system by
@@ -607,9 +607,14 @@ MS-DOS with some network redirector.
 
 @cindex directory listing on MS-DOS
 @vindex dired-listing-switches @r{(MS-DOS)}
-  Dired on MS-DOS uses the @code{ls-lisp} package where other
-platforms use the system @code{ls} command.  Therefore, Dired on
-MS-DOS supports only some of the possible options you can mention in
-the @code{dired-listing-switches} variable.  The options that work are
-@samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, @samp{-r}, @samp{-S},
-@samp{-s}, @samp{-t}, and @samp{-u}.
+  Dired on MS-DOS uses the @code{ls-lisp} package
+@iftex
+(@pxref{ls in Lisp,,,emacs, the Emacs Manual}).
+@end iftex
+@ifnottex
+(@pxref{ls in Lisp}).
+@end ifnottex
+Therefore, Dired on MS-DOS supports only some of the possible options
+you can mention in the @code{dired-listing-switches} variable.  The
+options that work are @samp{-A}, @samp{-a}, @samp{-c}, @samp{-i},
+@samp{-r}, @samp{-S}, @samp{-s}, @samp{-t}, and @samp{-u}.
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 8b050bee439..93bc5f0e4b1 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -159,7 +159,8 @@ save a buffer in a specified EOL format with the @kbd{C-x @key{RET} f}
 command.  For example, to save a buffer with Unix EOL format, type
 @kbd{C-x @key{RET} f unix @key{RET} C-x C-s}.  If you visit a file
 with DOS EOL conversion, then save it with Unix EOL format, that
-effectively converts the file to Unix EOL style, like @code{dos2unix}.
+effectively converts the file to Unix EOL style, like the
+@code{dos2unix} program.
 
 @cindex untranslated file system
 @findex add-untranslated-filesystem
@@ -221,7 +222,7 @@ for files which are known to be Windows-style text files with
 carriage-return linefeed EOL format, such as @file{CONFIG.SYS}; Emacs
 always writes those files with Windows-style EOLs.
 
-  If a file which belongs to an untranslated file system matches one of
+  If a file that belongs to an untranslated file system matches one of
 the file-name patterns in @code{file-name-buffer-file-type-alist}, the
 EOL conversion is determined by @code{file-name-buffer-file-type-alist}.
 
@@ -263,8 +264,8 @@ FAT32, and XFAT volumes.
 @cindex Dired, and MS-Windows/MS-DOS
 @cindex @code{ls} emulation
 
-  Dired normally uses the external program @code{ls} (or its close
-work-alike) to produce the directory listing displayed in Dired
+  Dired normally uses the external program @code{ls}
+to produce the directory listing displayed in Dired
 buffers (@pxref{Dired}).  However, MS-Windows and MS-DOS systems don't
 come with such a program, although several ports of @sc{gnu} @code{ls}
 are available.  Therefore, Emacs on those systems @emph{emulates}
@@ -281,8 +282,8 @@ they are described in this section.
   The @code{ls} emulation supports many of the @code{ls} switches, but
 it doesn't support all of them.  Here's the list of the switches it
 does support: @option{-A}, @option{-a}, @option{-B}, @option{-C},
-@option{-c}, @option{-i}, @option{-G}, @option{-g}, @option{-R},
-@option{-r}, @option{-S}, @option{-s}, @option{-t}, @option{-U},
+@option{-c}, @option{-G}, @option{-g}, @option{-h}, @option{-i}, @option{-n},
+@option{-R}, @option{-r}, @option{-S}, @option{-s}, @option{-t}, @option{-U},
 @option{-u}, and @option{-X}.  The @option{-F} switch is partially
 supported (it appends the character that classifies the file, but does
 not prevent symlink following).
@@ -413,9 +414,9 @@ value of @code{HOME}.
   You can override this default value of @code{HOME} by explicitly
 setting the environment variable @env{HOME} to point to any directory
 on your system.  @env{HOME} can be set either from the command shell
-prompt or from the @samp{My Computer}s @samp{Properties} dialog.
-@code{HOME} can also be set in the system registry, for details see
-@ref{MS-Windows Registry}.
+prompt or from @samp{Properties} dialog of @samp{My Computer}.
+@code{HOME} can also be set in the system registry,
+@pxref{MS-Windows Registry}.
 
   For compatibility with older versions of Emacs@footnote{
 Older versions of Emacs didn't check the application data directory.
@@ -431,9 +432,9 @@ deprecated.
   Whatever the final place is, Emacs sets the internal value of the
 @env{HOME} environment variable to point to it, and it will use that
 location for other files and directories it normally looks for or
-creates in the user's home directory.
+creates in your home directory.
 
-  You can always find out where Emacs thinks is your home directory's
+  You can always find out what Emacs thinks is your home directory's
 location by typing @kbd{C-x d ~/ @key{RET}}.  This should present the
 list of files in the home directory, and show its full name on the
 first line.  Likewise, to visit your init file, type @kbd{C-x C-f
@@ -510,7 +511,7 @@ otherwise it returns @code{nil}.
 @cindex @kbd{M-@key{TAB}} vs @kbd{Alt-@key{TAB}} (MS-Windows)
 @cindex @kbd{Alt-@key{TAB}} vs @kbd{M-@key{TAB}} (MS-Windows)
   For example, @code{(w32-register-hot-key [M-tab])} lets you use
-@kbd{M-TAB} normally in Emacs, for instance, to complete the word or
+@kbd{M-TAB} normally in Emacs; for instance, to complete the word or
 symbol at point at top level, or to complete the current search string
 against previously sought strings during incremental search.
 
@@ -589,7 +590,7 @@ of these variables.  Passing each of these keys to Windows produces
 its normal effect: for example, @kbd{@key{Lwindow}} opens the
 @code{Start} menu, etc.@footnote{
 Some combinations of the ``Windows'' keys with other keys are caught
-by Windows at low level in a way that Emacs currently cannot prevent.
+by Windows at a low level in a way that Emacs currently cannot prevent.
 For example, @kbd{@key{Lwindow} r} always pops up the Windows
 @samp{Run} dialog.  Customizing the value of
 @code{w32-phantom-key-code} might help in some cases, though.}
@@ -612,7 +613,7 @@ modifiers.
 @cindex mouse, and MS-Windows
 
   This section describes the Windows-specific variables related to
-mouse.
+the mouse.
 
 @vindex w32-mouse-button-tolerance
 @cindex simulation of middle mouse button
@@ -689,8 +690,8 @@ to do its job.
 @vindex w32-quote-process-args
   The variable @code{w32-quote-process-args} controls how Emacs quotes
 the process arguments.  Non-@code{nil} means quote with the @code{"}
-character.  If the value is a character, use that character to escape
-any quote characters that appear; otherwise chose a suitable escape
+character.  If the value is a character, Emacs uses that character to escape
+any quote characters that appear; otherwise it chooses a suitable escape
 character based on the type of the program.
 
 @ifnottex
@@ -723,7 +724,7 @@ tell Emacs which printer to use.
   If you want to use your local printer, then set the Lisp variable
 @code{lpr-command} to @code{""} (its default value on Windows) and
 @code{printer-name} to the name of the printer port---for example,
-@code{"PRN"}, the usual local printer port or @code{"LPT2"}, or
+@code{"PRN"}, the usual local printer port, or @code{"LPT2"}, or
 @code{"COM1"} for a serial printer.  You can also set
 @code{printer-name} to a file name, in which case ``printed'' output
 is actually appended to that file.  If you set @code{printer-name} to
@@ -738,7 +739,7 @@ printers, run the command @samp{net view} from the command prompt to
 obtain a list of servers, and @samp{net view @var{server-name}} to see
 the names of printers (and directories) shared by that server.
 Alternatively, click the @samp{Network Neighborhood} icon on your
-desktop, and look for machines which share their printers via the
+desktop, and look for machines that share their printers via the
 network.
 
 @cindex @samp{net use}, and printing on MS-Windows
@@ -797,8 +798,8 @@ specified by @code{printer-name}.
   Finally, if you do have an @code{lpr} work-alike, you can set the
 variable @code{lpr-command} to @code{"lpr"}.  Then Emacs will use
 @code{lpr} for printing, as on other systems.  (If the name of the
-program isn't @code{lpr}, set @code{lpr-command} to specify where to
-find it.)  The variable @code{lpr-switches} has its standard meaning
+program isn't @code{lpr}, set @code{lpr-command} to the appropriate value.)
+The variable @code{lpr-switches} has its standard meaning
 when @code{lpr-command} is not @code{""}.  If the variable
 @code{printer-name} has a string value, it is used as the value for the
 @code{-P} option to @code{lpr}, as on Unix.
@@ -822,7 +823,7 @@ ports, and only one of them is a PostScript printer.)
 @cindex Ghostscript, use for PostScript printing
   The default value of the variable @code{ps-lpr-command} is @code{""},
 which causes PostScript output to be sent to the printer port specified
-by @code{ps-printer-name}, but @code{ps-lpr-command} can also be set to
+by @code{ps-printer-name}; but @code{ps-lpr-command} can also be set to
 the name of a program which will accept PostScript files.  Thus, if you
 have a non-PostScript printer, you can set this variable to the name of
 a PostScript interpreter program (such as Ghostscript).  Any switches
@@ -980,7 +981,7 @@ the system default antialiasing.
 determines whether to make the system caret visible.  The default when
 no screen reader software is in use is @code{nil}, which means Emacs
 draws its own cursor to indicate the position of point.  A
-non-@code{nil} value means Emacs will indicate point location by the
+non-@code{nil} value means Emacs will indicate point location with the
 system caret; this facilitates use of screen reader software, and is
 the default when such software is detected when running Emacs.
 When this variable is non-@code{nil}, other variables affecting the