Update copyright year to 2015

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

diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index e6cf46acbe59f1b5150a37bd5a5cefa66e7e667c..d8e84c1f91470224d46d53dbb754d61b78eb81ef 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 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
@@ -55,12 +55,12 @@ This displays the available Emacs packages based on keywords.
 @xref{Package Keywords}.
 @end table
 
-  @kbd{C-h}, @key{F1}, or @kbd{?} means ``help'' in various other
-contexts as well.  For instance, you can type them after a prefix key
-to view a list of the keys that can follow the prefix key.  (A few
-prefix keys don't support @kbd{C-h} or @kbd{?} in this way, because
-they define other meanings for it, but they all support @key{F1} for
-help.)
+  @kbd{C-h} or @key{F1} mean ``help'' in various other contexts as
+well.  For instance, you can type them after a prefix key to view a
+list of the keys that can follow the prefix key.  (You can also use
+@kbd{?} in this context.  A few prefix keys don't support @kbd{C-h}
+or @kbd{?} in this way, because they define other meanings for those
+inputs, but they all support @key{F1}.)
 
 @menu
 * Help Summary::        Brief list of all Help commands.
@@ -129,7 +129,7 @@ Display news of recent Emacs changes (@code{view-emacs-news}).
 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}).
@@ -490,8 +490,7 @@ currently in use.  @xref{Coding Systems}.
 @kindex C-h i
 @findex info
 @cindex Info
-@cindex manuals, on-line
-@cindex on-line manuals
+@cindex manuals, included
   @kbd{C-h i} (@code{info}) runs the Info program, which browses
 structured documentation files.  The entire Emacs manual is available
 within Info, along with many other manuals for the GNU system.  Type
@@ -556,10 +555,10 @@ Emacs Lisp Reference Manual}).
 typing @kbd{C-h}, @kbd{?}, or @key{F1}
 (@code{describe-prefix-bindings}) after the prefix key.  (There are a
 few prefix keys for which not all of these keys work---those that
-provide their own bindings for one of them.  One of these prefix keys
-is @key{ESC} in combination with @kbd{C-h}, because @kbd{@key{ESC} C-h} is
-actually @kbd{C-M-h}, which marks a defun.  However, @kbd{@key{ESC} @key{F1}}
-and @kbd{@key{ESC} ?} work fine.)
+provide their own bindings for that key.  One of these prefix keys
+is @key{ESC}, because @kbd{@key{ESC} C-h} is actually @kbd{C-M-h},
+which marks a defun.  However, @kbd{@key{ESC} @key{F1}} and
+@kbd{@key{ESC} ?} work fine.)
 
 @node Help Files
 @section Help Files