summaryrefslogtreecommitdiff
path: root/doc/emacs/commands.texi
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2018-03-11 20:07:38 +0200
committerEli Zaretskii <eliz@gnu.org>2018-03-11 20:07:38 +0200
commit51866758c1a1b808897fc869d651b21fd492ee1a (patch)
treeeddd394bd4d0ba7c4ac2abee62f58568c88d9d4a /doc/emacs/commands.texi
parentb1aaa72df8e0afd8a849aab7525640f1cec66af3 (diff)
downloademacs-51866758c1a1b808897fc869d651b21fd492ee1a.tar.gz
More changes in the Emacs manual
* doc/emacs/text.texi (Words, Foldout, Table Conversion): Clarify text. Reported by Gijs Hillenius <gijs@hillenius.net> in emacs-manual-bugs@gnu.org. * doc/emacs/msdos.texi (Windows Keyboard): * doc/emacs/msdos-xtra.texi (MS-DOS Keyboard): * doc/emacs/macos.texi (Mac / GNUstep Basics): * doc/emacs/glossary.texi (Glossary): * doc/emacs/custom.texi (Function Keys, Init Syntax): * doc/emacs/commands.texi (User Input): * doc/emacs/basic.texi (Arguments): Fix capitalization of "Meta". * doc/emacs/msdos.texi (Windows Keyboard): * doc/emacs/dired.texi (Dired Updating): * doc/emacs/custom.texi (Init Rebinding): Fix misuses of @key. Suggested by Richard Stallman <rms@gnu.org>.
Diffstat (limited to 'doc/emacs/commands.texi')
-rw-r--r--doc/emacs/commands.texi12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 8b8b0c7aad9..a992dedc929 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -44,25 +44,25 @@ are certain characters found on non-English keyboards
@cindex M-
Emacs also recognizes control characters that are entered using
@dfn{modifier keys}. Two commonly-used modifier keys are
-@key{Control} (usually labeled @key{Ctrl}), and @key{META} (usually
-labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{META} for
+@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually
+labeled @key{Alt})@footnote{We refer to @key{Alt} as @key{Meta} for
historical reasons.}. For example, @kbd{Control-a} is entered by
holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
-to this as @kbd{C-a} for short. Similarly, @kbd{@key{META}-a}, or @kbd{M-a}
+to this as @kbd{C-a} for short. Similarly, @kbd{@key{Meta}-a}, or @kbd{M-a}
for short, is entered by holding down the @key{Alt} key and pressing
@kbd{a}. Modifier keys can also be applied to non-alphanumerical
characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}.
-@cindex @key{ESC} replacing @key{META} key
+@cindex @key{ESC} replacing @key{Meta} key
You can also type Meta characters using two-character sequences
starting with @key{ESC}. Thus, you can enter @kbd{M-a} by typing
@kbd{@key{ESC} a}. You can enter @kbd{C-M-a} (holding down both
@key{Ctrl} and @key{Alt}, then pressing @kbd{a}) by typing
-@kbd{@key{ESC} C-a}. Unlike @key{META}, @key{ESC} is entered as a
+@kbd{@key{ESC} C-a}. Unlike @key{Meta}, @key{ESC} is entered as a
separate character. You don't hold down @key{ESC} while typing the
next character; instead, press @key{ESC} and release it, then enter
the next character. This feature is useful on certain text terminals
-where the @key{META} key does not function reliably.
+where the @key{Meta} key does not function reliably.
@cindex keys stolen by window manager
@cindex window manager, keys stolen by