aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-07 18:37:23 -0700
committerGlenn Morris2014-06-07 18:37:23 -0700
commitf25df0d7032439d32f6b00a76d2af3d7bb4f735c (patch)
tree3eef29ce64edf088af9603e8a3681d494cc94c96
parent8cc3d19715ff0a0c7fb1f663a34484a4475e80f2 (diff)
downloademacs-f25df0d7032439d32f6b00a76d2af3d7bb4f735c.tar.gz
emacs-f25df0d7032439d32f6b00a76d2af3d7bb4f735c.zip
* doc/emacs/help.texi (Help, Misc Help): Copyedits.
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/help.texi20
2 files changed, 12 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 81506a1d0e0..993028d0b19 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
12014-06-08 Glenn Morris <rgm@gnu.org> 12014-06-08 Glenn Morris <rgm@gnu.org>
2 2
3 * help.texi (Help, Misc Help): Copyedits.
4
3 * screen.texi (Menu Bar): Copyedits. 5 * screen.texi (Menu Bar): Copyedits.
4 * msdog.texi (Windows Keyboard): F10 menus are now a general feature. 6 * msdog.texi (Windows Keyboard): F10 menus are now a general feature.
5 7
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 19f0c41ec60..db5448692f9 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -55,12 +55,12 @@ This displays the available Emacs packages based on keywords.
55@xref{Package Keywords}. 55@xref{Package Keywords}.
56@end table 56@end table
57 57
58 @kbd{C-h}, @key{F1}, or @kbd{?} means ``help'' in various other 58 @kbd{C-h} or @key{F1} mean ``help'' in various other contexts as
59contexts as well. For instance, you can type them after a prefix key 59well. For instance, you can type them after a prefix key to view a
60to view a list of the keys that can follow the prefix key. (A few 60list of the keys that can follow the prefix key. (You can also use
61prefix keys don't support @kbd{C-h} or @kbd{?} in this way, because 61@kbd{?} in this context. A few prefix keys don't support @kbd{C-h}
62they define other meanings for it, but they all support @key{F1} for 62or @kbd{?} in this way, because they define other meanings for those
63help.) 63inputs, but they all support @key{F1}.)
64 64
65@menu 65@menu
66* Help Summary:: Brief list of all Help commands. 66* Help Summary:: Brief list of all Help commands.
@@ -556,10 +556,10 @@ Emacs Lisp Reference Manual}).
556typing @kbd{C-h}, @kbd{?}, or @key{F1} 556typing @kbd{C-h}, @kbd{?}, or @key{F1}
557(@code{describe-prefix-bindings}) after the prefix key. (There are a 557(@code{describe-prefix-bindings}) after the prefix key. (There are a
558few prefix keys for which not all of these keys work---those that 558few prefix keys for which not all of these keys work---those that
559provide their own bindings for one of them. One of these prefix keys 559provide their own bindings for that key. One of these prefix keys
560is @key{ESC} in combination with @kbd{C-h}, because @kbd{@key{ESC} C-h} is 560is @key{ESC}, because @kbd{@key{ESC} C-h} is actually @kbd{C-M-h},
561actually @kbd{C-M-h}, which marks a defun. However, @kbd{@key{ESC} @key{F1}} 561which marks a defun. However, @kbd{@key{ESC} @key{F1}} and
562and @kbd{@key{ESC} ?} work fine.) 562@kbd{@key{ESC} ?} work fine.)
563 563
564@node Help Files 564@node Help Files
565@section Help Files 565@section Help Files