Skip to content

Commit 5e108cc

Browse files
committed
Correct words
1 parent 2458c6c commit 5e108cc

7 files changed

Lines changed: 11 additions & 11 deletions

ch12_search_and_substitute.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Search and Substitute
22
This chapter covers two separate but related concepts: search and substitute. Many times, the texts that you are searching for are not straightforward and you must search for a common pattern. By learning how to use meaningful patterns in search and substitute instead of literal strings, you will be able to target any text quickly.
33

4-
As a side note, in this chapter, I will mainly use `/` when talking about search. Eveything you can do with `/` can also be done with `?`.
4+
As a side note, in this chapter, I will mainly use `/` when talking about search. Everything you can do with `/` can also be done with `?`.
55

66
# Smart Case Sensitivity
77

@@ -274,7 +274,7 @@ three let = "3";
274274
four let = "4";
275275
five let = "5";
276276
```
277-
You neeed to swap all the "let" with the variable names. To do that, run:
277+
You need to swap all the "let" with the variable names. To do that, run:
278278

279279
```
280280
:%s/\(\w\+\) \(\w\+\)/\2 \1/
@@ -389,7 +389,7 @@ If you need to replace a URL with a long path:
389389
https://mysite.com/a/b/c/d/e
390390
```
391391

392-
To suibstitute it with the word "hello", run:
392+
To substitute it with the word "hello", run:
393393
```
394394
:s/https:\/\/mysite.com\/a\/b\/c\/d\/e/hello/
395395
```

ch2_buffers_windows_tabs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Ctrl-W o Makes the current window the only one on screen and closes other win
111111
And here is a list of useful window Ex commands:
112112
```
113113
:vsplit filename Split window vertically
114-
:split filename Split window horiontally
114+
:split filename Split window horizontally
115115
:new filename Create new window
116116
```
117117

@@ -163,11 +163,11 @@ Moving between windows is like traveling two-dimensionally along X-Y axis in a C
163163

164164
![cartesian movement in x and y axis](./img/cartesian-xy.png)
165165

166-
Moving between buffers is like travelling across the Z axis in a Cartesian coordinate. Imagine your buffer files are lined up across the Z axis. You can traverse the Z axis one buffer at a time with `:bnext` and `:bprevious`. You can jump to any coordinate in Z axis with `:buffer filename/buffernumber`.
166+
Moving between buffers is like traveling across the Z axis in a Cartesian coordinate. Imagine your buffer files are lined up across the Z axis. You can traverse the Z axis one buffer at a time with `:bnext` and `:bprevious`. You can jump to any coordinate in Z axis with `:buffer filename/buffernumber`.
167167

168168
![cartesian movement in z axis](./img/cartesian-z.png)
169169

170-
You can move in *three-dimensional space* by combining window and buffer movements. You can move to the top, right, bottom, or left window (X-Y navigations) with window navigations. Since each window contains buffers, you can move foward and backward (Z navigations) with buffer movements.
170+
You can move in *three-dimensional space* by combining window and buffer movements. You can move to the top, right, bottom, or left window (X-Y navigations) with window navigations. Since each window contains buffers, you can move forward and backward (Z navigations) with buffer movements.
171171

172172
![cartesian movement in x, y, and z axis](./img/cartesian-xyz.png)
173173

ch3_opening_and_searching_files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ For example, to look for all occurrences of "foo" string inside all ruby files (
127127
:vim /foo/ app/controllers/**/*.rb
128128
```
129129

130-
After running that command, you will be redirected to the first result. Vim's `vim` search command uses `quickfix` operation. To see all search results, run `:copen`. This opens a `quickfix` window. Here are some useful quickfix commands to get you productive immmediately:
130+
After running that command, you will be redirected to the first result. Vim's `vim` search command uses `quickfix` operation. To see all search results, run `:copen`. This opens a `quickfix` window. Here are some useful quickfix commands to get you productive immediately:
131131

132132
```
133133
:copen Open the quickfix window

ch4_vim_grammar.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the most important chapter in the entire book. Once you understand Vim c
66

77
# How to learn a language
88

9-
I am not a native English speaker. I learned English when I was 13 when I moved to the US. I had to do three things to build up linguistic profiency:
9+
I am not a native English speaker. I learned English when I was 13 when I moved to the US. I had to do three things to build up linguistic proficiency:
1010

1111
1. Learn grammar rules
1212
2. Increase my vocabulary

ch5_moving_in_file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ To my surprise, it only took a few days to get used to using `hjkl`.
3232

3333
*By the way, if you wonder why Vim uses `hjkl` to move, this is because Lear-Siegler ADM-3A terminal where Bill Joy wrote Vi, didn't have arrow keys and used `hjkl` as left/down/up/right.*
3434

35-
If I want to go somewhere close by, like moving from one part of a word to another part of the same word, I would use `h` or `l`. If I want to go up or down a few lines within displayed window, I would use `j` or `k`. If I want to go somewhere farther, I would use a diffferent motion.
35+
If I want to go somewhere close by, like moving from one part of a word to another part of the same word, I would use `h` or `l`. If I want to go up or down a few lines within displayed window, I would use `j` or `k`. If I want to go somewhere farther, I would use a different motion.
3636

3737
# Relative Numbering
3838

ch7_the_dot_command.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ When you are editing, always be on the lookout for a motion that can do several
101101

102102
# Learn the Dot Command the Smart Way
103103

104-
The dot command's power comes from exchanging several keystrokes for one. It is probably not a profitable exchangeto use the dot command for one-keyed-operations like `x`. If your last change requires a complex operation like `cgnconst<esc>`, the dot command reduces nine keypresses into one, a very good trade-off.
104+
The dot command's power comes from exchanging several keystrokes for one. It is probably not a profitable exchange to use the dot command for one-keyed-operations like `x`. If your last change requires a complex operation like `cgnconst<esc>`, the dot command reduces nine keypresses into one, a very good trade-off.
105105

106106
When editing, ask if the action you are about to do is repeatable. For example, if I need to remove the next three words, is it more economical to use `d3w` or to do `dw` then `.` two times? Will you be deleting a word again? If so, then it makes sense to use `dw` and repeat it several times instead of `d3w` because `dw` is more reusable than `d3w`. Keep a "change-driven" mindset while editing.
107107

ch9_macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Running `99@a`, only executes the macro three times. It does not execute the mac
253253

254254
Recall from earlier section that macros can be executed using the command line command `:normal` (ex: `:3,5 normal @a` to execute macro "a" on lines 3-5). If you run `:1,$ normal @a`, you will see that the macro is being executed on all lines except the "foo" line. It works!
255255

256-
Although internally Vim does not actually run the macros in parallel, outwardly, it behaves like such. Vim executes `@a` *independently* on each line from the first line to the last line (`1,$`). Since Vim executes these macros indpendently, each line does not know that one of the macro executions had failed on the "foo" line.
256+
Although internally Vim does not actually run the macros in parallel, outwardly, it behaves like such. Vim executes `@a` *independently* on each line from the first line to the last line (`1,$`). Since Vim executes these macros independently, each line does not know that one of the macro executions had failed on the "foo" line.
257257

258258
# Learn Macros the Smart Way
259259

0 commit comments

Comments
 (0)