diff man/help.texi @ 83400:03934708f1e9

Merged from [e-mail]--gnu-2005 (patch 152-156, 642-654) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-642 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-643 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-644 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-645 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-646 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-647 lisp/gnus/ChangeLog: Remove duplicate entry * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-648 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-649 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-650 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-651 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-652 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-653 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-654 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-152 Update from CVS: lisp/mml.el (mml-preview): Doc fix. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-153 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-154 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-155 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-156 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-440

--- a/man/help.texi	Mon Nov 07 15:25:27 2005 +0000
+++ b/man/help.texi	Fri Nov 18 13:13:34 2005 +0000
@@ -46,17 +46,19 @@
 @table @kbd
 @item C-h a @var{topic} @key{RET}
 This searches for commands whose names match @var{topic}, which should
-be a regular expression (@pxref{Regexps}).  Browse the buffer that this
-command displays to find what you are looking for.  @xref{Apropos}.
+be a list of words or a regular expression (@pxref{Regexps}).  Browse
+the buffer that this command displays to find what you are looking
+for.  @xref{Apropos}.
 
 @item M-x apropos @key{RET} @var{topic} @key{RET}
 This works like @kbd{C-h a}, but it also searches for noninteractive
 functions and for variables.  @xref{Apropos}.
 
-@item M-x apropos-documentation @key{RET} @var{topic} @key{RET}
+@item C-h d @var{topic} @key{RET}
 This searches the @emph{documentation strings} (the built-in short
 descriptions) of all variables and functions (not their names) for a
-match for @var{topic}, a regular expression.  @xref{Apropos}.
+match for @var{topic}, a list or words or a regular expression.
+@xref{Apropos}.
 
 @item C-h i d m emacs @key{RET} i @var{topic} @key{RET}
 This looks up @var{topic} in the indices of the Emacs on-line manual.
@@ -111,8 +113,8 @@
 pre-written file of information.
 
 @table @kbd
-@item C-h a @var{regexp} @key{RET}
-Display a list of commands whose names match @var{regexp}
+@item C-h a @var{topic} @key{RET}
+Display a list of commands whose names match word list or regexp @var{topic}
 (@code{apropos-command}).
 @item C-h b
 Display a table of all key bindings in effect now, in this order: minor
@@ -122,6 +124,13 @@
 Show the name of the command that @var{key} runs
 (@code{describe-key-briefly}).  Here @kbd{c} stands for ``character.''
 For more extensive information on @var{key}, use @kbd{C-h k}.
+@item C-h d @var{topic} @key{RET}
+Display a list of commands and variables whose documentation match
+word list or regexp @var{topic}
+(@code{apropos-documentation}).
+@item C-h e
+Display the @code{*Messages*} buffer
+(@code{view-echo-area-messages}).
 @item C-h f @var{function} @key{RET}
 Display documentation on the Lisp function named @var{function}
 (@code{describe-function}).  Since commands are Lisp functions,
@@ -304,25 +313,27 @@
 @end quotation
 
 @findex apropos-variable
-  To list all user variables that match a regexp, use the command
-@kbd{M-x apropos-variable}.  By default, this command shows only
-variables meant for user customization; if you specify a prefix
+  To list all user variables that match a word list or regexp, use the
+command @kbd{M-x apropos-variable}.  By default, this command shows
+only variables meant for user customization; if you specify a prefix
 argument, it checks all variables.
 
 @findex apropos
-  To list all Lisp symbols that contain a match for a regexp, not just
-the ones that are defined as commands, use the command @kbd{M-x apropos}
-instead of @kbd{C-h a}.  This command does not check key bindings by
-default; specify a numeric argument if you want it to check them.
+  To list all Lisp symbols that contain a match for a word list or
+regexp, not just the ones that are defined as commands, use the
+command @kbd{M-x apropos} instead of @kbd{C-h a}.  This command does
+not check key bindings by default; specify a numeric argument if you
+want it to check them.
 
+@kindex C-h d
 @findex apropos-documentation
   The @code{apropos-documentation} command is like @code{apropos} except
 that it searches documentation strings as well as symbol names for
-matches for the specified regular expression.
+matches for the specified topic, a word list or regular expression.
 
 @findex apropos-value
   The @code{apropos-value} command is like @code{apropos} except that it
-searches symbols' values for matches for the specified regular
+searches symbols' values for matches for the specified word list or regular
 expression.  This command does not check function definitions or
 property lists by default; specify a numeric argument if you want it to
 check them.
@@ -338,6 +349,12 @@
 Apropos tries to guess the relevance of each result, and displays the
 most relevant ones first.
 
+@vindex apropos-documentation-sort-by-scores
+  By default, Apropos lists the search results for
+  @code{apropos-documentation} in order of relevance.
+If the variable @code{apropos-documentation-sort-by-scores} is @code{nil},
+Apropos will list documentation in alphabetical order.
+
   If you want more information about a function definition, variable or
 symbol property listed in the Apropos buffer, you can click on it with
 @kbd{Mouse-1} or @kbd{Mouse-2}, or move there and type @key{RET}.
@@ -613,8 +630,10 @@
 the mouse or a key like @kbd{RET}, it often has associated help text.
 Areas of the mode line are examples.  On most window systems, the help
 text is displayed as a ``tooltip'' (sometimes known as ``balloon
-help'').  @xref{Tooltips}.  Otherwise, it is shown in the echo area
-when you move point into the active text.
+help''), when you move the mouse over the active text.  @xref{Tooltips}.
+On some systems, it is shown in the echo area.  On text-only
+terminals, Emacs may not be able to follow the mouse and hence will
+not show the help text on mouse-over.
 
 @kindex C-h .
 @findex display-local-help