Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

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

diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 10b5fcfb09583281be1fb6bfb175e83120ef8ac5..a9c63b9178592eae5039e8055aa23e72e8879fc5 100644 (file)
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
 @c This is part of the Emacs manual.

-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software

 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Help
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Help


@@ -72,7 +72,7 @@ inputs, but they all support @key{F1}.)
 * Language Help::       Help relating to international language support.
 * Misc Help::           Other help commands.
 * Help Files::          Commands to display auxiliary help files.
 * Language Help::       Help relating to international language support.
 * Misc Help::           Other help commands.
 * Help Files::          Commands to display auxiliary help files.

-* Help Echo::           Help on active text and tooltips ("balloon help").
+* Help Echo::           Help on active text and tooltips (``balloon help'').

 @end menu
 
 @iftex
 @end menu
 
 @iftex


@@ -122,14 +122,15 @@ Display the name and documentation of the command that @var{key} runs
 Display a description of your last 300 keystrokes
 (@code{view-lossage}).
 @item C-h m
 Display a description of your last 300 keystrokes
 (@code{view-lossage}).
 @item C-h m

-Display documentation of the current major mode (@code{describe-mode}).
+Display documentation of the current major mode and minor modes
+(@code{describe-mode}).

 @item C-h n
 Display news of recent Emacs changes (@code{view-emacs-news}).
 @item C-h p
 Find packages by topic keyword (@code{finder-by-keyword}).  This lists
 packages using a package menu buffer.  @xref{Packages}.
 @item C-h P @var{package} @key{RET}
 @item C-h n
 Display news of recent Emacs changes (@code{view-emacs-news}).
 @item C-h p
 Find packages by topic keyword (@code{finder-by-keyword}).  This lists
 packages using a package menu buffer.  @xref{Packages}.
 @item C-h P @var{package} @key{RET}

-Display documentation about the package named @var{package}
+Display documentation about the specified package

 (@code{describe-package}).
 @item C-h r
 Display the Emacs manual in Info (@code{info-emacs-manual}).
 (@code{describe-package}).
 @item C-h r
 Display the Emacs manual in Info (@code{info-emacs-manual}).


@@ -358,8 +359,11 @@ view, describe, default.
 @end quotation
 
 @vindex apropos-do-all
 @end quotation
 
 @vindex apropos-do-all

-  If the variable @code{apropos-do-all} is non-@code{nil}, the apropos
-commands always behave as if they had been given a prefix argument.
+  If the variable @code{apropos-do-all} is non-@code{nil}, most
+apropos commands behave as if they had been given a prefix argument.
+There is one exception: @code{apropos-variable} without a prefix
+argument will always search for all variables, no matter what the
+value of @code{apropos-do-all} is.

 
 @vindex apropos-sort-by-scores
 @cindex apropos search results, order by score
 
 @vindex apropos-sort-by-scores
 @cindex apropos search results, order by score


@@ -610,7 +614,7 @@ Project (@code{describe-gnu-project}).
 Display information about ordering printed copies of Emacs manuals
 (@code{view-order-manuals}).
 @item C-h C-n
 Display information about ordering printed copies of Emacs manuals
 (@code{view-order-manuals}).
 @item C-h C-n

-Display the ``news'' file, which lists the new features in this
+Display the news, which lists the new features in this

 version of Emacs (@code{view-emacs-news}).
 @item C-h C-o
 Display how to order or download the latest version of
 version of Emacs (@code{view-emacs-news}).
 @item C-h C-o
 Display how to order or download the latest version of


@@ -630,7 +634,8 @@ Emacs (@code{describe-no-warranty}).
 
 @cindex tooltips
 @cindex balloon help
 
 @cindex tooltips
 @cindex balloon help

-  In Emacs, stretches of ``active text'' (text that does something
+@cindex active text
+  In Emacs, stretches of @dfn{active text} (text that does something

 special in response to mouse clicks or @key{RET}) often have
 associated help text.  This includes hyperlinks in Emacs buffers, as
 well as parts of the mode line.  On graphical displays, as well as
 special in response to mouse clicks or @key{RET}) often have
 associated help text.  This includes hyperlinks in Emacs buffers, as
 well as parts of the mode line.  On graphical displays, as well as