From 771bd26b778c089e153604244c00430f36227943 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Thu, 26 Nov 2020 17:08:26 +0100 Subject: [PATCH] Remove keyboard anachronisms from tutorial MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * etc/tutorials/TUTORIAL: Don't keep referring to EDIT as if it were a common name for the Meta key; since a few decades back it's labelled Alt (or Option or ⌥ but those keys usually also have 'alt' engraved on them). Similarly, CTL is practically extinct and not worth mentioning. --- etc/tutorials/TUTORIAL | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 319ba52b670..a5b4b76916f 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -1,13 +1,13 @@ Emacs tutorial. See end for copying conditions. -Emacs commands generally involve the CONTROL key (sometimes labeled -CTRL or CTL) or the META key (sometimes labeled EDIT or ALT). Rather than -write that in full each time, we'll use the following abbreviations: +Emacs commands generally involve the CONTROL key (often labeled CTRL) +or the META key (usually labeled ALT). Rather than writing that +in full each time, we'll use the following abbreviations: C- means hold the CONTROL key while typing the character Thus, C-f would be: hold the CONTROL key and type f. - M- means hold the META or EDIT or ALT key down while typing . - If there is no META, EDIT or ALT key, instead press and release the + M- means hold the META or ALT key down while typing . + If there is no META or ALT key, instead press and release the ESC key and then type . We write for the ESC key. Important note: to end the Emacs session, type C-x C-c. (Two characters.) @@ -33,7 +33,7 @@ that is called "editing" and that's what Emacs is for. The first thing that you need to know is how to move around from place to place in the text. You already know how to move forward one screen, with C-v. To move backwards one screen, type M-v (hold down the META key -and type v, or type v if you do not have a META, EDIT, or ALT key). +and type v, or type v if you do not have a META or ALT key). >> Try typing M-v and then C-v, a few times. @@ -196,7 +196,7 @@ easily learn to use other advanced cursor motion commands as well. Most Emacs commands accept a numeric argument; for most commands, this serves as a repeat-count. The way you give a command a repeat count is by typing C-u and then the digits before you type the command. If -you have a META (or EDIT or ALT) key, there is another, alternative way +you have a META (or ALT) key, there is another, alternative way to enter a numeric argument: type the digits while holding down the META key. We recommend learning the C-u method because it works on any terminal. The numeric argument is also called a "prefix argument", @@ -676,7 +676,7 @@ another in the buffer. When you type M-x, Emacs prompts you at the bottom of the screen with M-x and you should type the name of the command; in this case, "replace-string". Just type "repl s" and Emacs will complete the name. ( is the Tab key, usually found -above the CapsLock or Shift key near the left edge of the keyboard.) +above the Caps Lock or Shift key near the left edge of the keyboard.) Submit the command name with . The replace-string command requires two arguments--the string to be @@ -1024,7 +1024,7 @@ very brief documentation--sufficient to remind you of commands you have already learned. Multi-character commands such as C-x C-s and v (instead of M-v, -if you have no META or EDIT or ALT key) are also allowed after C-h c. +if you have no META or ALT key) are also allowed after C-h c. To get more information about a command, use C-h k instead of C-h c. -- 2.39.5