summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cmake.html.markdown2
-rw-r--r--java.html.markdown2
-rw-r--r--vim.html.markdown18
3 files changed, 11 insertions, 11 deletions
diff --git a/cmake.html.markdown b/cmake.html.markdown
index a2c8cc8a..45cf0585 100644
--- a/cmake.html.markdown
+++ b/cmake.html.markdown
@@ -45,7 +45,7 @@ cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8 FATAL_ERROR)
# We setup the name for our project. After we do that, this will change some
-# directories naming convention genearted by CMake. We can send the LANG of
+# directories naming convention generated by CMake. We can send the LANG of
# code as second param
project (learncmake C)
diff --git a/java.html.markdown b/java.html.markdown
index 56bffd88..57c10390 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -566,7 +566,7 @@ class PennyFarthing extends Bicycle {
// out: http://docs.oracle.com/javase/tutorial/java/annotations/
@Override
public void setGear(int gear) {
- gear = 0;
+ this.gear = 0;
}
}
diff --git a/vim.html.markdown b/vim.html.markdown
index 80c5835a..edbc3da7 100644
--- a/vim.html.markdown
+++ b/vim.html.markdown
@@ -8,7 +8,7 @@ filename: LearnVim.txt
[Vim](www.vim.org)
-(Vi IMproved) is a clone of the popular vi editor for Unix. It is a a text
+(Vi IMproved) is a clone of the popular vi editor for Unix. It is a text
editor designed for speed and increased productivity, and is ubiquitous in most
unix-based systems. It has numerous keybindings for speedy navigation to
specific points in the file, and for fast editing.
@@ -19,7 +19,7 @@ specific points in the file, and for fast editing.
vim <filename> # Open <filename> in vim
:q # Quit vim
:w # Save current file
- :wq # Save file and quit vim
+ :wq # Save file and quit vim
:q! # Quit vim without saving file
# ! *forces* :q to execute, hence quiting vim without saving
:x # Save file and quit vim, shorter version of :wq
@@ -77,9 +77,9 @@ specific points in the file, and for fast editing.
Vim is based on the concept on **modes**.
-Command Mode - vim starts up in this mode, used to navigate and write commands
-Insert Mode - used to make changes in your file
-Visual Mode - used to highlight text and do operations to them
+Command Mode - vim starts up in this mode, used to navigate and write commands
+Insert Mode - used to make changes in your file
+Visual Mode - used to highlight text and do operations to them
Ex Mode - used to drop down to the bottom with the ':' prompt to enter commands
```
@@ -105,15 +105,15 @@ Ex Mode - used to drop down to the bottom with the ':' prompt to enter comm
Vim can be thought of as a set of commands in a
'Verb-Modifier-Noun' format, where:
-Verb - your action
-Modifier - how you're doing your action
+Verb - your action
+Modifier - how you're doing your action
Noun - the object on which your action acts on
-A few important examples of 'Verbs, 'Modifiers', and 'Nouns':
+A few important examples of 'Verbs', 'Modifiers', and 'Nouns':
```
# 'Verbs'
-
+
d # Delete
c # Change
y # Yank (copy)