Be consistent when naming CONTROL and META keys.

etc/ChangeLog

+2001-08-04  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* TUTORIAL, TUTORIAL.cs: be consistent when naming CONTROL and META keys.
+
 2001-05-17  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.1: Add the latest changes to etags behaviour.

etc/TUTORIAL

@@ -16,7 +16,7 @@ The characters ">>" at the left margin indicate directions for you to
 try using a command.  For instance:
 <<Blank lines inserted here by startup of help-with-tutorial>>
 >>  Now type C-v (View next screen) to move to the next screen.
-	(go ahead, do it by holding down the control key while typing v).
+	(go ahead, do it by holding down the CONTROL key while typing v).
 	From now on, you should do this again whenever you finish
 	reading the screen.
 
@@ -42,7 +42,7 @@ The following commands are useful for viewing screenfuls:
 	C-l	Clear screen and redisplay all the text,
 		 moving the text around the cursor
 		 to the center of the screen.
-		 (That's control-L, not control-1.)
+		 (That's CONTROL-L, not CONTROL-1.)
 
 >> Find the cursor, and note what text is near it.
    Then type C-l.
@@ -108,7 +108,7 @@ without moving it off the screen.
    see what happens.
 
 If moving by characters is too slow, you can move by words.  M-f
-(Meta-f) moves forward a word and M-b moves back a word.
+(META-f) moves forward a word and M-b moves back a word.
 
 >> Type a few M-f's and M-b's.
 
@@ -162,8 +162,8 @@ word and sentence moving commands:
 >> Try all of these commands now a few times for practice.
    These are the most often used commands.
 
-Two other important cursor motion commands are M-< (Meta Less-than),
-which moves to the beginning of the whole text, and M-> (Meta
+Two other important cursor motion commands are M-< (META Less-than),
+which moves to the beginning of the whole text, and M-> (META
 Greater-than), which moves to the end of the whole text.
 
 On most terminals, the "<" is above the comma, so you must use the
@@ -274,20 +274,20 @@ one-window editing.  It is simple:
 
 	C-x 1	One window (i.e., kill all other windows).
 
-That is Control-x followed by the digit 1.  C-x 1 expands the window
+That is CONTROL-x followed by the digit 1.  C-x 1 expands the window
 which contains the cursor, to occupy the full screen.  It deletes all
 other windows.
 
 >> Move the cursor to this line and type C-u 0 C-l.
->> Type Control-h k Control-f.
+>> Type CONTROL-h k CONTROL-f.
    See how this window shrinks, while a new one appears
-   to display documentation on the Control-f command.
+   to display documentation on the CONTROL-f command.
 
 >> Type C-x 1 and see the documentation listing window disappear.
 
 This command is unlike the other commands you have learned in that it
-consists of two characters.  It starts with the character Control-x.
-There is a whole series of commands that start with Control-x; many of
+consists of two characters.  It starts with the character CONTROL-x.
+There is a whole series of commands that start with CONTROL-x; many of
 them have to do with windows, files, buffers, and related things.
 These commands are two, three or four characters long.
 
@@ -783,7 +783,7 @@ as a numeric argument.
 
 If you make changes in the middle of a paragraph, Auto Fill mode
 does not re-fill it for you.
-To re-fill the paragraph, type M-q (Meta-q) with the cursor inside
+To re-fill the paragraph, type M-q (META-q) with the cursor inside
 that paragraph.
 
 >> Move the cursor into the previous paragraph and type M-q.
@@ -856,14 +856,14 @@ the search is reversed.
 One of the nice features of Emacs is that you can display more than one
 window on the screen at the same time.
 
->> Move the cursor to this line and type C-u 0 C-l (that's control-L, not
-   control-1).
+>> Move the cursor to this line and type C-u 0 C-l (that's CONTROL-L, not
+   CONTROL-1).
 
 >> Now type C-x 2 which splits the screen into two windows.
    Both windows display this tutorial.  The cursor stays in the top window.
 
 >> Type C-M-v to scroll the bottom window.
-   (If you do not have a real Meta key, type ESC C-v.)
+   (If you do not have a real META key, type ESC C-v.)
 
 >> Type C-x o ("o" for "other") to move the cursor to the bottom window.
 >> Use C-v and M-v in the bottom window to scroll it.
@@ -888,8 +888,8 @@ typing v.  It does not matter whether CONTROL or META "comes first,"
 because both of these keys act by modifying the characters you type.
 
 If you do not have a real META key, and you use ESC instead, the order
-does matter: you must type ESC followed by Control-v, because
-Control-ESC v will not work.  This is because ESC is a character in
+does matter: you must type ESC followed by CONTROL-v, because
+CONTROL-ESC v will not work.  This is because ESC is a character in
 its own right, not a modifier key.
 
 >> Type C-x 1 (in the top window) to get rid of the bottom window.
@@ -941,7 +941,7 @@ it would be impossible to explain it all here.  However, you may want
 to learn more about Emacs since it has many other useful features.
 Emacs provides commands for reading documentation about Emacs
 commands.  These "help" commands all start with the character
-Control-h, which is called "the Help character".
+CONTROL-h, which is called "the Help character".
 
 To use the Help features, type the C-h character, and then a
 character saying what kind of help you want.  If you are REALLY lost,
@@ -998,7 +998,7 @@ the name of the variable when Emacs prompts for it.
 
    C-h a	Command Apropos.  Type in a keyword and Emacs will list
 		all the commands whose names contain that keyword.
-		These commands can all be invoked with Meta-x.
+		These commands can all be invoked with META-x.
 		For some commands, Command Apropos will also list a one
 		or two character sequence which runs the same command.
 

etc/TUTORIAL.cs

@@ -19,7 +19,7 @@ Znaky ">>" na lev
 Napklad:
 <<Blank lines inserted here by startup of help-with-tutorial>>
 >>  Nyn stisknte C-v (view next screen) pro posun na dal obrazovku.
-        (Smle do toho, provete to pidrenm klvesy control a stiskem v.)
+        (Smle do toho, provete to pidrenm klvesy CONTROL a stiskem v.)
 	Od tto chvle byste toto mli provdt kdykoliv dotete zobrazenou
         obrazovku.
 
@@ -45,7 +45,7 @@ K prohl
 	M-v	Posun o obrazovku zpt
 	C-l	Smazn obrazovky a znovuzobrazen celho textu,
 		 pitom se text pod kurzorem pesune ke stedu obrazovky.
-		 (Jedn se o control-L a ne control-1.)
+		 (Jedn se o CONTROL-L a ne CONTROL-1.)
 
 >> Najdte kurzor a zapamatujte si, jak text je kolem nj.
    Pak stisknte C-l.
@@ -111,7 +111,7 @@ ani
    co se stane.
 
 Jestlie je posun po znacch pli pomal, mete se pohybovat po
-slovech.  M-f (Meta-f) provd posun o slovo vped a M-b provd posun
+slovech.  M-f (META-f) provd posun o slovo vped a M-b provd posun
 o slovo zpt.
 
 >> Stisknte nkolikrt M-f a M-b.
@@ -126,10 +126,10 @@ sm
    mezi nimi.
 
 Vimnte si analogie mezi C-f a C-b na jedn stran a M-f a M-b na
-stran druh.  Meta znaky jsou velmi asto vyuvny pro operace
+stran druh.  Znaky s klvesou META jsou velmi asto vyuvny pro operace
 vztahujc se k entitm definovanm jazykem (slova, vty, odstavce),
-zatmco Control znaky pracuj na zkladnch prvcch nezvislch na tom,
-co zrovna editujete (znaky, dky, apod.).
+zatmco znaky s klvesou CONTROL pracuj na zkladnch prvcch
+nezvislch na tom, co zrovna editujete (znaky, dky, apod.).
 
 Tato analogie plat tak pro dky a vty: C-a a C-e provd pesun
 na zatek a konec dku, M-a a M-e provd pesun na zatek a konec
@@ -167,8 +167,8 @@ pohyb mezi slovy a v
 >> Vyzkouejte si te nkolikrt vechny tyto pkazy pro procvien.
    Jsou to nejpouvanj pkazy.
 
-Dal dva dleit pkazy pro pohyb kurzoru jsou M-< (Meta men-ne),
-kter provede pesun na zatek celho textu, a M-> (Meta vt-ne),
+Dal dva dleit pkazy pro pohyb kurzoru jsou M-< (META men-ne),
+kter provede pesun na zatek celho textu, a M-> (META vt-ne),
 kter provede pesun na konec celho textu.
 
 Na vtin terminl je "<" nad rkou, take pro vyvoln tohoto znaku
@@ -272,12 +272,12 @@ jednookenn
 
 	C-x 1	Jedno okno (tj. zruen vech ostatnch oken)
 
-Tedy vloen Control-x nsledovan slic 1.  C-x 1 roz okno
+Tedy vloen CONTROL-x nsledovan slic 1.  C-x 1 roz okno
 obsahujc kurzor pes celou obrazovku.  Zru to vechna ostatn okna.
 
->> Stisknte Control-h k Control-f.
+>> Stisknte C-h k C-f.
    Pozorujte, jak se aktuln okno zmen a objev se nov okno za
-   elem zobrazen dokumentace k pkazu Control-f.
+   elem zobrazen dokumentace k pkazu C-f.
 
 >> Stisknte C-x 1 a pozorujte, jak okno s dokumentac zmiz.
 
@@ -341,7 +341,7 @@ Zde je shrnut
 	M-k	     Zruen textu do konce aktuln vty
 
 Vimnte si, e <Delete> a C-d, resp. M-<Delete> a M-d, roziuj
-paralelu zapoatou C-f a M-f (pravda, <Delete> opravdu nen control
+paralelu zapoatou C-f a M-f (pravda, <Delete> opravdu nen CONTROL
 znak, ale netrapme se tm).  C-k a M-k jsou jako C-e a M-e ve smyslu
 vztahu dk k vtm.
 
@@ -475,8 +475,8 @@ vyhled
 
 Pkazy pro vyhledvn a ukldn soubor se na rozdl od ostatnch
 pkaz, kter jste se zatm nauili, skldaj ze dvou znak.  Oba
-zanaj znakem Control-x.  Existuje cel ada pkaz zanajcch na
-Control-x; mnoho z nich pracuje se soubory, buffery a podobnmi vcmi.
+zanaj znakem CONTROL-x.  Existuje cel ada pkaz zanajcch na
+CONTROL-x; mnoho z nich pracuje se soubory, buffery a podobnmi vcmi.
 Tyto pkazy jsou dlouh dva, ti nebo tyi znaky.
 
 Dal vc ohledn pkazu pro vyhledn souboru je to, e muste ct,
@@ -587,7 +587,7 @@ neulo
 --------------------------
 
 Existuje mnohem, mnohem vce pkaz Emacsu, ne kter by vbec mohly
-bt rozmstny na vechny control a meta znaky.  Emacs tento problm
+bt rozmstny na vechny CONTROL a META znaky.  Emacs tento problm
 obchz prostednictvm X (eXtend) pkazu.  Ten vznik dvma zpsoby:
 
 	C-x	Znakov eXtend.  Nsledovn jednm znakem.
@@ -769,7 +769,7 @@ numerick
 
 Jestlie provedete zmny uprosted odstavce, Auto Fill md jej
 nepeformtuje. 
-Pro peformtovn odstavce stisknte M-q (Meta-q) s kurzorem uvnit
+Pro peformtovn odstavce stisknte M-q (META-q) s kurzorem uvnit
 odstavce.
 
 >> Pesute kurzor do pedchozho odstavce a stisknte M-q.
@@ -821,7 +821,7 @@ na
 prvn vskyt "ku".  Te stisknte <Delete>.  To vymae "u" z hledanho
 etzce a kurzor se pesune zpt na prvn vskyt "k".
 
-Jestlie uprosted hledn stisknete control nebo meta znak (s nkolika
+Jestlie uprosted hledn stisknete CONTROL nebo META znak (s nkolika
 vjimkami -- znaky, kter jsou speciln v hledn, jako C-s a C-r),
 hledn se ukon.
 
@@ -843,7 +843,7 @@ v
    Ob okna zobrazuj tento tutoril.  Kurzor zstv navrchu okna.
 
 >> Tisknte C-M-v pro scrollovn spodnho okna.
-   (Nemte-li skutenou klvesu Meta, stisknte ESC C-v.)
+   (Nemte-li skutenou klvesu META, stisknte ESC C-v.)
 
 >> Stisknte C-x o ("o" jako "other") pro pesun kurzoru do dolnho okna.
 
@@ -919,7 +919,7 @@ abyste mohli za
 nemon to zde vechno objasnit.  Nicmn se o Emacsu mete nauit
 vce, protoe m mnoho uitench vlastnost.  Emacs nabz pkazy pro
 ten dokumentace svch pkaz.  Vechny tyto "help" pkazy
-zanaj znakem Control-h, kter se nazv "help znak".
+zanaj znakem CONTROL-h, kter se nazv "help znak".
 
 Pro pouit vlastnost npovdy stisknte znak C-h a pak znak kajc,
 jak druh npovdy dte.  Jste-li OPRAVDU ztraceni, stisknte C-h ? a
@@ -936,7 +936,7 @@ toho pou
 Nejzkladnj help pkaz je C-h c.  Stisknte C-h, znak c a klvesov
 pkaz; Emacs pak zobraz velmi strun popis pkazu.
 
->> Stisknte C-h c Control-p.
+>> Stisknte C-h c C-p.
    Hlen by mlo vypadat asi takto
 
 	C-p runs the command previous-line
@@ -952,7 +952,7 @@ kl
 
 K zskn vce informac o pkazu msto C-h c pouijte C-h k.
 
->> Stisknte C-h k Control-p.
+>> Stisknte C-h k C-p.
 
 To zobraz dokumentaci k funkci a jej jmno v emacsovm okn.  A
 vstup petete, stisknte C-x 1, abyste se textu npovdy zbavili.
@@ -974,7 +974,7 @@ zadat a
    C-h a	Pkazov apropos.  Zadejte klov slovo a Emacs vype
 		vechny pkazy, jejich jmna obsahuj toto klov
 		slovo.  Vechny tyto pkazy mohou bt vyvolny pomoc
-		Meta-x.  Pro nkter pkazy pkazov apropos vype
+		META-x.  Pro nkter pkazy pkazov apropos vype
 		tak jedno nebo dvouznakov sekvence, kter provdj
 		tent pkaz.