Skip to content

Commit 6a1494d

Browse files
authored
Merge pull request #94 from vim-jp/update-tutor
tutor: Update for 8.1.0189
2 parents 38b15fe + 1bc6db0 commit 6a1494d

File tree

2 files changed

+65
-64
lines changed

2 files changed

+65
-64
lines changed

runtime/tutor/tutor

+40-40
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
properly. If you only read the text, you will forget the commands!
2020

2121
Now, make sure that your Caps-Lock key is NOT depressed and press
22-
the j key enough times to move the cursor so that Lesson 1.1
22+
the j key enough times to move the cursor so that lesson 1.1
2323
completely fills the screen.
2424
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2525
Lesson 1.1: MOVING THE CURSOR
@@ -36,7 +36,7 @@
3636
2. Hold down the down key (j) until it repeats.
3737
Now you know how to move to the next lesson.
3838

39-
3. Using the down key, move to Lesson 1.2.
39+
3. Using the down key, move to lesson 1.2.
4040

4141
NOTE: If you are ever unsure about something you typed, press <ESC> to place
4242
you in Normal mode. Then retype the command you wanted.
@@ -64,7 +64,7 @@ NOTE: The cursor keys should also work. But using hjkl you will be able to
6464
NOTE: :q! <ENTER> discards any changes you made. In a few lessons you
6565
will learn how to save the changes to a file.
6666

67-
5. Move the cursor down to Lesson 1.3.
67+
5. Move the cursor down to lesson 1.3.
6868

6969

7070
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,7 +84,7 @@ NOTE: :q! <ENTER> discards any changes you made. In a few lessons you
8484

8585
---> The ccow jumpedd ovverr thhe mooon.
8686

87-
5. Now that the line is correct, go on to Lesson 1.4.
87+
5. Now that the line is correct, go on to lesson 1.4.
8888

8989
NOTE: As you go through this tutor, do not try to memorize, learn by usage.
9090

@@ -126,7 +126,7 @@ NOTE: As you go through this tutor, do not try to memorize, learn by usage.
126126

127127
3. As the text has been appended press <ESC> to return to Normal mode.
128128

129-
4. Move the cursor to the second line marked ---> and repeat
129+
4. Move the cursor to the second line marked ---> and repeat
130130
steps 2 and 3 to correct this sentence.
131131

132132
---> There is some text missing from th
@@ -152,13 +152,13 @@ NOTE: As you go through this tutor, do not try to memorize, learn by usage.
152152

153153
3. Insert and delete text as you learned in the previous lessons.
154154

155-
4. Save the file with changes and exit Vim with: :wq <ENTER>
155+
4. Save the file with changes and exit Vim with: :wq <ENTER>
156156

157157
5. If you have quit vimtutor in step 1 restart the vimtutor and move down to
158158
the following summary.
159159

160160
6. After reading the above steps and understanding them: do it.
161-
161+
162162
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
163163
Lesson 1 SUMMARY
164164

@@ -180,7 +180,7 @@ NOTE: As you go through this tutor, do not try to memorize, learn by usage.
180180
NOTE: Pressing <ESC> will place you in Normal mode or will cancel
181181
an unwanted and partially completed command.
182182

183-
Now continue with Lesson 2.
183+
Now continue with lesson 2.
184184

185185
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
186186
Lesson 2.1: DELETION COMMANDS
@@ -202,7 +202,7 @@ Now continue with Lesson 2.
202202

203203
---> There are a some words fun that don't belong paper in this sentence.
204204

205-
5. Repeat steps 3 and 4 until the sentence is correct and go to Lesson 2.2.
205+
5. Repeat steps 3 and 4 until the sentence is correct and go to lesson 2.2.
206206

207207

208208
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -222,7 +222,7 @@ Now continue with Lesson 2.
222222
---> Somebody typed the end of this line twice. end of this line twice.
223223

224224

225-
5. Move on to Lesson 2.3 to understand what is happening.
225+
5. Move on to lesson 2.3 to understand what is happening.
226226

227227

228228

@@ -257,7 +257,7 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
257257

258258
** Typing a number before a motion repeats it that many times. **
259259

260-
1. Move the cursor to the start of the line marked ---> below.
260+
1. Move the cursor to the start of the line below marked --->.
261261

262262
2. Type 2w to move the cursor two words forward.
263263

@@ -269,7 +269,7 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
269269

270270
---> This is just a line with words you can move around in.
271271

272-
6. Move on to Lesson 2.5.
272+
6. Move on to lesson 2.5.
273273

274274

275275

@@ -286,10 +286,10 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
286286

287287
1. Move the cursor to the first UPPER CASE word in the line marked --->.
288288

289-
2. Type d2w to delete the two UPPER CASE words
289+
2. Type d2w to delete the two UPPER CASE words.
290290

291291
3. Repeat steps 1 and 2 with a different count to delete the consecutive
292-
UPPER CASE words with one command
292+
UPPER CASE words with one command.
293293

294294
---> this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
295295

@@ -338,7 +338,7 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
338338

339339
---> Fiix the errors oon thhis line and reeplace them witth undo.
340340

341-
8. These are very useful commands. Now move on to the Lesson 2 Summary.
341+
8. These are very useful commands. Now move on to the lesson 2 Summary.
342342

343343

344344

@@ -372,7 +372,7 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
372372

373373
** Type p to put previously deleted text after the cursor. **
374374

375-
1. Move the cursor to the first ---> line below.
375+
1. Move the cursor to the first line below marked --->.
376376

377377
2. Type dd to delete the line and store it in a Vim register.
378378

@@ -406,7 +406,7 @@ NOTE: Pressing just the motion while in Normal mode without an operator will
406406
---> Whan this lime was tuoed in, someone presswd some wrojg keys!
407407
---> When this line was typed in, someone pressed some wrong keys!
408408

409-
5. Now move on to Lesson 3.3.
409+
5. Now move on to lesson 3.3.
410410

411411
NOTE: Remember that you should be learning by doing, not memorization.
412412

@@ -447,7 +447,7 @@ Notice that ce deletes the word and places you in Insert mode.
447447

448448
2. The motions are the same, such as w (word) and $ (end of line).
449449

450-
3. Move to the first line below marked --->.
450+
3. Move the cursor to the first line below marked --->.
451451

452452
4. Move the cursor to the first error.
453453

@@ -558,7 +558,7 @@ NOTE: This is very useful in debugging a program with unmatched parentheses!
558558

559559
1. Move the cursor to the line below marked --->.
560560

561-
2. Type :s/thee/the <ENTER> . Note that this command only changes the
561+
2. Type :s/thee/the <ENTER> . Note that this command only changes the
562562
first occurrence of "thee" in the line.
563563

564564
3. Now type :s/thee/the/g . Adding the g flag means to substitute
@@ -623,7 +623,7 @@ NOTE: All : commands must be finished by hitting <ENTER>
623623
Lesson 5.2: MORE ON WRITING FILES
624624

625625

626-
** To save the changes made to the text, type :w FILENAME. **
626+
** To save the changes made to the text, type :w FILENAME **
627627

628628
1. Type :!dir or :!ls to get a listing of your directory.
629629
You already know you must hit <ENTER> after this.
@@ -638,7 +638,7 @@ NOTE: All : commands must be finished by hitting <ENTER>
638638
NOTE: If you were to exit Vim and start it again with vim TEST , the file
639639
would be an exact copy of the tutor when you saved it.
640640

641-
5. Now remove the file by typing (MS-DOS): :!del TEST
641+
5. Now remove the file by typing (Windows): :!del TEST
642642
or (Unix): :!rm TEST
643643

644644

@@ -673,15 +673,15 @@ NOTE: Pressing v starts Visual selection. You can move the cursor around
673673

674674
1. Place the cursor just above this line.
675675

676-
NOTE: After executing Step 2 you will see text from Lesson 5.3. Then move
676+
NOTE: After executing Step 2 you will see text from lesson 5.3. Then move
677677
DOWN to see this lesson again.
678678

679679
2. Now retrieve your TEST file using the command :r TEST where TEST is
680680
the name of the file you used.
681681
The file you retrieve is placed below the cursor line.
682682

683683
3. To verify that a file was retrieved, cursor back and notice that there
684-
are now two copies of Lesson 5.3, the original and the file version.
684+
are now two copies of lesson 5.3, the original and the file version.
685685

686686
NOTE: You can also read the output of an external command. For example,
687687
:r !ls reads the output of the ls command and puts it below the
@@ -695,7 +695,7 @@ NOTE: You can also read the output of an external command. For example,
695695
1. :!command executes an external command.
696696

697697
Some useful examples are:
698-
(MS-DOS) (Unix)
698+
(Windows) (Unix)
699699
:!dir :!ls - shows a directory listing.
700700
:!del FILENAME :!rm FILENAME - removes file FILENAME.
701701

@@ -717,7 +717,7 @@ NOTE: You can also read the output of an external command. For example,
717717

718718
** Type o to open a line below the cursor and place you in Insert mode. **
719719

720-
1. Move the cursor to the line below marked --->.
720+
1. Move the cursor to the first line below marked --->.
721721

722722
2. Type the lowercase letter o to open up a line BELOW the cursor and place
723723
you in Insert mode.
@@ -740,8 +740,8 @@ NOTE: You can also read the output of an external command. For example,
740740

741741
** Type a to insert text AFTER the cursor. **
742742

743-
1. Move the cursor to the start of the line below marked --->.
744-
743+
1. Move the cursor to the start of the first line below marked --->.
744+
745745
2. Press e until the cursor is on the end of li .
746746

747747
3. Type an a (lowercase) to append text AFTER the cursor.
@@ -750,7 +750,7 @@ NOTE: You can also read the output of an external command. For example,
750750
mode.
751751

752752
5. Use e to move to the next incomplete word and repeat steps 3 and 4.
753-
753+
754754
---> This li will allow you to pract appendi text to a line.
755755
---> This line will allow you to practice appending text to a line.
756756

@@ -786,10 +786,10 @@ NOTE: Replace mode is like Insert mode, but every typed character deletes an
786786

787787
** Use the y operator to copy text and p to paste it **
788788

789-
1. Go to the line marked with ---> below and place the cursor after "a)".
790-
789+
1. Move to the line below marked ---> and place the cursor after "a)".
790+
791791
2. Start Visual mode with v and move the cursor to just before "first".
792-
792+
793793
3. Type y to yank (copy) the highlighted text.
794794

795795
4. Move the cursor to the end of the next line: j$
@@ -802,14 +802,14 @@ NOTE: Replace mode is like Insert mode, but every typed character deletes an
802802
---> a) this is the first item.
803803
b)
804804

805-
NOTE: you can also use y as an operator; yw yanks one word.
805+
NOTE: You can also use y as an operator; yw yanks one word.
806806
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
807807
Lesson 6.5: SET OPTION
808808

809809

810810
** Set an option so a search or substitute ignores case **
811811

812-
1. Search for 'ignore' by entering: /ignore <ENTER>
812+
1. Search for 'ignore' by entering: /ignore <ENTER>
813813
Repeat several times by pressing n .
814814

815815
2. Set the 'ic' (Ignore case) option by entering: :set ic
@@ -823,9 +823,9 @@ NOTE: Replace mode is like Insert mode, but every typed character deletes an
823823

824824
6. To disable ignoring case enter: :set noic
825825

826-
NOTE: To remove the highlighting of matches enter: :nohlsearch
826+
NOTE: To remove the highlighting of matches enter: :nohlsearch
827827
NOTE: If you want to ignore case for just one search command, use \c
828-
in the phrase: /ignore\c <ENTER>
828+
in the phrase: /ignore\c <ENTER>
829829
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
830830
Lesson 6 SUMMARY
831831

@@ -883,7 +883,7 @@ NOTE: If you want to ignore case for just one search command, use \c
883883

884884
1. Start editing the "vimrc" file. This depends on your system:
885885
:e ~/.vimrc for Unix
886-
:e $VIM/_vimrc for MS-Windows
886+
:e $VIM/_vimrc for Windows
887887

888888
2. Now read the example "vimrc" file contents:
889889
:r $VIMRUNTIME/vimrc_example.vim
@@ -909,7 +909,7 @@ NOTE: If you want to ignore case for just one search command, use \c
909909

910910
4. Press CTRL-D and Vim will show a list of commands that start with "e".
911911

912-
5. Press <TAB> and Vim will complete the command name to ":edit".
912+
5. Type d<TAB> and Vim will complete the command name to ":edit".
913913

914914
6. Now add a space and the start of an existing file name: :edit FIL
915915

@@ -922,13 +922,13 @@ NOTE: Completion works for many commands. Just try pressing CTRL-D and
922922
Lesson 7 SUMMARY
923923

924924

925-
1. Type :help or press <F1> or <Help> to open a help window.
925+
1. Type :help or press <F1> or <HELP> to open a help window.
926926

927927
2. Type :help cmd to find help on cmd .
928928

929-
3. Type CTRL-W CTRL-W to jump to another window
929+
3. Type CTRL-W CTRL-W to jump to another window.
930930

931-
4. Type :q to close the help window
931+
4. Type :q to close the help window.
932932

933933
5. Create a vimrc startup script to keep your preferred settings.
934934

0 commit comments

Comments
 (0)