Skip to content

GitLab

Commit de04a3ca authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Restore copyright years. Update tutorial. Fix wording.

parent c6142507
Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 253 deletions
etc/ChangeLog
View file @ de04a3ca
2008-02-02 Eli Zaretskii <eliz@gnu.org>
* TUTORIAL.ru: Restore copyright years. Update tutorial. Fix
wording.
2008-01-31 Alex Ott <alexott@gmail.com>
* TUTORIAL.ru: Update tutorial.
......
etc/TUTORIAL.ru
View file @ de04a3ca
Emacs.
Emacs. .
Emacs (key --
Emacs' (key --
/ ), CONTROL (
CTRL CTL) META ( ALT
EDIT). , , META CONTROL,
:
C-<chr> -- CONTROL,
<chr>. , C-f : CONTROL f.
<chr>. , C-f : CONTROL f.
M-<chr> -- META,
<chr>. META, ALT EDIT, <ESC>,
, <chr>.
......@@ -23,7 +23,7 @@ EDIT).
[ . ]
[ . ]
......@@ -33,8 +33,8 @@ EDIT).
>> C-v ( )
. ( CONTROL
v). ,
. ( CONTROL
v.) ,
.
,
......@@ -56,8 +56,9 @@ EDIT).
C-v
M-v
C-l , ,
, . ( CONTROL-L, CONTROL-1.)
C-l ,
, ,
. ( CONTROL-L, CONTROL-1.)
>> . C-l.
, .
......@@ -73,7 +74,7 @@ EDIT).
,
?
.
.
(),
C-p, C-b, C-f C-n.
,
......@@ -88,7 +89,7 @@ EDIT).
, C-n
>> ,
C-n C-p. C-l
C-n C-p. C-l
.
......@@ -103,8 +104,8 @@ EDIT).
-, .
(Newline
character), .
( Emacs
character), .
( Emacs
).
>> C-b .
......@@ -119,8 +120,8 @@ C-f
.
, ,
, . "
(scrolling)". Emacs'
, . ""
(scrolling). Emacs'
.
>> , C-n,
......@@ -160,8 +161,8 @@ Control-
.
,
:
,
:
C-f
C-b
......@@ -194,7 +195,7 @@ Greater-than {
C-v, .
>> M->, .
M-v, .
M-v, .
(),
. C-b, C-f, C-n C-p
......@@ -248,21 +249,21 @@ META.
* X-
------------------------------------
X-, , ,
X-, , , ,
(). , ,
-- C-b, C-f, C-p
C-n, .
C-left C-right , C-up C-down
(.. , ).
(.. , ).
HOME ( BEGIN) / END,
, C-home C-end
. PgUp PgDn,
. PgUp PgDn,
,
M-v C-v.
, ,
.
.
: CONTROL META . ,
12 , C-1 C-2 C-right. ,
, CONTROL
......@@ -273,7 +274,7 @@ C-n,
------------------
Emacs , ,
C-g. C-g,
C-g. C-g,
, .
C-g
......@@ -309,13 +310,13 @@ C-n,
------
Emacs ,
. .
. :
. .
. :
C-x 1 . ( ).
CONTROL-x 1. C-x 1 ,
CONTROL-x 1. C-x 1 ,
, , .
.
......@@ -337,24 +338,24 @@ Emacs
*
--------------------
, . ,
, . ,
, A, 7, *, . Emacs'
. <Return> ( ),
.
, <Delback>. <Delback> --
, <Delback>. <Delback> --
, Emacs
. ,
<Return>; "Delete",
"Del" "Backspace".
. ,
<Return>; "Delete", "Del"
"Backspace".
"Backspace", ,
, <Delback>.
, "Delete", ,
<Delback>.
, <Delback>.
, "Delete", ,
<Delback>.
, <Delback>
.
, <Delback>
.
>> -- ,
<Delback>. --
......@@ -367,14 +368,14 @@ Emacs
.
>> , ,
. , .
. , .
>> <Delback> ,
. .
. .
, .
. ,
. ,
, ,
.
......@@ -390,28 +391,28 @@ Emacs
>> -- C-u 8 * ********.
Emacs .
.
Emacs .
.
:
<Delback>
C-d ()
M-<Delback> ,
M-d ,
M-d ,
C-k
M-k
C-k
M-k
, <Delback> C-d, M-<Delback> M-d
, C-f M-f (, <Delback> --
, ). C-k M-k, C-e M-e,
.
.
.
C-@ C-<SPC> (
). <SPC> .
C-w.
). <SPC> .
C-w.
.
>> .
......@@ -438,20 +439,20 @@ Emacs
, .
, C-k ,
C-k . C-k
C-k . C-k
--
__ . . C-u 2
__ . . C-u 2
C-k , ;
C-k .
" (yanking)". (
,
).
.
.
.
C-y.
C-y.
.
>> -- C-y,
......@@ -465,25 +466,25 @@ C-k
:
>> C-y. ,
C-y. , .
>> C-y. ,
C-y. , .
, , ,
- ? C-y
. --
, M-y.
. --
, M-y.
, M-y ,
. M-y ,
. M-y ,
. ,
, . ,
, . ,
, .
M-y ,
( ).
>> , .
>> , .
C-y ,
M-y, . M-y
M-y, . M-y
, .
,
. ,
......@@ -502,7 +503,7 @@ C-x u
-- , (
),
20 . (
20 . (
C-x u, ).
>> C-k, C-x u,
......@@ -511,7 +512,7 @@ C-x u
C-_ -- ; , C-x u,
,
. C-_
. C-x u.
. C-x u.
C-_, / CONTROL.
C-_ C-x u .
......@@ -525,34 +526,34 @@ C-_ --
-------
,
. , Emacs.
. , Emacs.
, "" ( "" ).
Emacs.
Emacs.
, .
, Emacs, ,
.
, . ,
.
, . ,
Emacs , ,
, .
, ,
, "--:-- TUTORIAL.ru".
. ,
"TUTORIAL.ru",
Emacs. , ,
.
, "--:-- TUTORIAL.ru".
. ,
"TUTORIAL.ru",
Emacs. , , Emacs
.
, -- ,
, .
, .
, " " (
).
C-x C-f ()
Emacs .
. - --
.
. - --
.
Emacs.
( -),
......@@ -572,10 +573,10 @@ Emacs
C-x C-s
Emacs . ,
Emacs . ,
, Emacs ,
.
"~" .
.
"~" .
, Emacs .
,
......@@ -585,27 +586,29 @@ Emacs
"Wrote ...TUTORIAL.ru".
: C-x C-s ,
Emacs`. ,
Emacs`. ,
"", "flow control",
C-s Emacs`.
C-q. "Spontaneous
C-s Emacs'.
C-q. "Spontaneous
Entry to Incremental Search" Emacs ,
"".
.
, . --
Emacs : , ,
. , Emacs
. , ,
.
, .
Emacs: (Emacs
) .
, Emacs
. , ,
.
*
--------
, C-x C-f,
Emacs. ,
C-x C-f. Emacs.
, C-x C-f,
Emacs'. ,
C-x C-f.
Emacs.
>> "foo", C-x C-f foo <Return>.
- , , "foo",
......@@ -613,9 +616,9 @@ Entry to Incremental Search"
, C-x C-f TUTORIAL.ru <Return> ,
.
Emacs , ""
("buffer"). Emacs.
, Emacs,
Emacs , "" ("buffer").
Emacs.
, Emacs,
C-x C-b
......@@ -623,94 +626,93 @@ Emacs
,
, . ,
Emacs, - .
Emacs', - .
>> C-x 1, .
, ""
. , .
, "" .
, ,
C-x C-f. --
C-x b.
. , .
, "" .
, ,
C-x C-f. --
C-x b.
.
>> C-x b foo <Return> "foo",
"foo". C-x b TUTORIAL <Return>
.
"foo". C-x b TUTORIAL.ru <Return>
.
( ).
. ,
C-x C-b, .
( ).
. ,
C-x C-b, .
, Emacs,
- . . ,
"*Buffer List*" . ,
, , C-x C-b.
"*Messages*" ;
, Emacs
.
- . . ,
"*Buffer List*" .
C-x C-b .
"*Messages*" ; ,
Emacs
.
>> C-x b *Messages* <Return>
. C-x b TUTORIAL <Return>
.
. C-x b TUTORIAL.ru <Return>
.
, ,
. Emacs,
. Emacs,
, .
. , ,
.
.
C-x C-f C-x C-s
.
C-x s . (Save some buffers)
C-x s ,
.
.
: .
>> , C-x s.
, TUTORIAL.ru.
, "y".
: TUTORIAL.ru.
"y".
*
--------------------------
Emacs , control-
meta- . Emacs , X- (eXtend).
:
meta- . Emacs , X- (eXtend,
). :
C-x . .
M-x .
.
M-x .
.
, , ,
. :
C-x C-f -- , C-x C-s -- . --
Emacs -- C-x C-c. ( ,
, C-x C-c
Emacs).
. :
C-x C-f -- , C-x C-s --
. -- Emacs' -- C-x C-c.
( , , C-x C-c
Emacs'.)
,
, Emacs'
. ,
,
"" Emacs.
C-z -- ** Emacs.
Emacs .
, , C-z
"" ("suspends") Emacs;
(shell), Emacs.
Emacs, `fg' `%emacs'.
, , C-z
(subshell), - Emacs,
, Emacs (
Emacs). Emacs
`exit'.
Emacs . Emacs ,
C-z "" ("suspends") Emacs, ..
(shell), Emacs.
Emacs, `fg', `%emacs' `exit'.
Emacs C-x C-c. ,
.
.
, Emacs,
, ,
Emacs. , ,
Emacs. , ,
Emacs, C-z, , .
, C-x.
......@@ -718,63 +720,63 @@ Emacs.
C-x C-f
C-x C-s
C-x s
C-x s
C-x C-b
C-x b
C-x b
C-x C-c Emacs
C-x 1
C-x u
C-x 1 ,
C-x u
-- , ,
.
-- , ,
.
,
. M-x, Emacs ;
"replace-string". "repl s<TAB>",
Emacs . (<TAB> -- ,
CapsLock Shift ).
. M-x, Emacs ;
"replace-string". "repl s<TAB>",
Emacs . (<TAB> -- ,
CapsLock Shift .)
<Return>.
(replace-string) -- ,
, , .
<Return>.
>> .
>> .
M-x repl s<Return><Return><Return>.
, : ---
, : ---
"" , , .
*
---------------------------
, ,
. , Emacs
, ,
. , Emacs
, .
, ,
"#"; , "hello.c",
"#hello.c#".
, Emacs .
,
"#" ; , "hello.c",
"#hello.c#".
, Emacs .
, ,
, (,
, ), M-x recover-file<return>.
, yes<return>,
, ), M-x recover-file<Return>.
, yes<Return>,
.
* (ECHO AREA)
* (ECHO AREA)
-------------------------
Emacs , ,
, " ".
-- .
, " ".
-- Emacs.
*
------------------
" ".
" ".
:
--:** TUTORIAL.ru <