summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@gnu.org>2014-06-08 22:30:13 +0300
committerEli Zaretskii <eliz@gnu.org>2014-06-08 22:30:13 +0300
commit8f356841d051aadf67da13afe396e4cf2cdc6b9e (patch)
tree55e6fcd336504841eeb4153e3adf56abb06aa17c
parent6d069b1b3ab171c86deed9c19ef9736d32d8fc43 (diff)
downloademacs-8f356841d051aadf67da13afe396e4cf2cdc6b9e.tar.gz
Simplify info.info for the stand-alone reader
doc/misc/info.texi (Help-^L): "mode line", "screenful", stand-alone and Emacs Info both use the mode line. Use x instead of weird C-x 0 to get rid of help msg in standalone Info.
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/info.texi18
2 files changed, 14 insertions, 11 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8e9eb83ca03..d1239338d23 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-08 Karl Berry <karl@gnu.org>
+
+ * doc/info.texi (Help-^L): "mode line", "screenful",
+ stand-alone and Emacs Info both use the mode line.
+ Use x instead of weird C-x 0 to get rid of help msg
+ in standalone Info.
+
2014-06-08 Glenn Morris <rgm@gnu.org>
* vip.texi (Files): Defer to Emacs manual for uniquify details.
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 09476126b7e..87e7794c61e 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -151,12 +151,11 @@ Since your terminal has a relatively small number of lines on its
screen, it is necessary to give you special advice at the beginning.
If the entire text you are looking at fits on the screen, the text
-@samp{All} will be displayed at the bottom of the screen. In the
-stand-alone Info reader, it is displayed at the bottom right corner of
-the screen; in Emacs, it is displayed on the modeline. If you see the
-text @samp{Top} instead, it means that there is more text below that
-does not fit. To move forward through the text and see another screen
-full, press @key{SPC}, the Space bar. To move back up, press the key
+@samp{All} will be displayed near the bottom of the screen, on the
+mode line (usually, the line in inverse video). If you see the text
+@samp{Top} instead, it means that there is more text below that does
+not fit. To move forward through the text and see another screenful,
+press @key{SPC}, the Space bar. To move back up, press the key
labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key
might be labeled @samp{Delete}). In a graphical Emacs, you can also use
@kbd{S-@key{SPC}} (press and hold the @key{Shift} key and then press
@@ -405,13 +404,10 @@ repeatedly.
>> Type a @key{?} now. Press @key{SPC} to see consecutive screenfuls of
the list until finished. Then type @key{SPC} several times. If
you are using Emacs, the help will then go away automatically.
+ If you are using the stand-alone Info reader, type @kbd{x} to
+ return here.
@end format
- (If you are using the stand-alone Info reader, type @kbd{C-x 0} to
-return here, that is---press and hold @key{CTRL}, type an @kbd{x},
-then release @key{CTRL} and @kbd{x}, and press @kbd{0}; that's a zero,
-not the letter ``o''.)
-
From now on, you will encounter large nodes without warning, and
will be expected to know how to use @key{SPC} and @key{BACKSPACE} to
move around in them without being told. Since not all terminals have