From 314a240945a8ebeff07c51042fed3a5139f6a72d Mon Sep 17 00:00:00 2001
From: shoeletz <adam.sulucz@gmail.com>
Date: Tue, 29 Dec 2015 12:09:30 -0500
Subject: [PATCH 1/5] vim: add :w, :wq, i

---
 pages/common/vim.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pages/common/vim.md b/pages/common/vim.md
index 9baa4bee0..ee1571262 100644
--- a/pages/common/vim.md
+++ b/pages/common/vim.md
@@ -16,4 +16,16 @@
 
 - Exit vim:
 
-`[Esc] (to switch to normal mode), then :q`
+`[Esc] (to switch to command mode), then :q`
+
+- save file in vim
+
+`[Esc] (to switch to command mode), then :w`
+
+- save file then exit vim
+
+`[Esc] (to switch to command mode), then :wq`
+
+- switch to edit (insert) mode
+
+`[Esc] (to switch to command mode), then i`

From 5adbb1fa34b3afe3b7aa8adde83d321bd07e5e1e Mon Sep 17 00:00:00 2001
From: shoeletz <adam.sulucz@gmail.com>
Date: Tue, 29 Dec 2015 21:24:21 -0500
Subject: [PATCH 2/5] Update vim.md

---
 pages/common/vim.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/common/vim.md b/pages/common/vim.md
index ee1571262..5fc98fce5 100644
--- a/pages/common/vim.md
+++ b/pages/common/vim.md
@@ -16,16 +16,16 @@
 
 - Exit vim:
 
-`[Esc] (to switch to command mode), then :q`
+`[Esc] (to switch to normal mode), then :q`
 
 - save file in vim
 
-`[Esc] (to switch to command mode), then :w`
+`[Esc] (to switch to normal mode), then :w`
 
 - save file then exit vim
 
-`[Esc] (to switch to command mode), then :wq`
+`[Esc] (to switch to normal mode), then :wq`
 
 - switch to edit (insert) mode
 
-`[Esc] (to switch to command mode), then i`
+`[Esc] (to switch to normal mode), then i`

From abcdb8dee25f586a5744b1c196ef74732a68c203 Mon Sep 17 00:00:00 2001
From: shoeletz <adam.sulucz@gmail.com>
Date: Tue, 5 Jan 2016 17:07:51 -0500
Subject: [PATCH 3/5] reduced repetetiveness of descriptions

---
 pages/common/vim.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pages/common/vim.md b/pages/common/vim.md
index 5fc98fce5..b7f4dd323 100644
--- a/pages/common/vim.md
+++ b/pages/common/vim.md
@@ -14,18 +14,22 @@
 
 `view {{file}}`
 
-- Exit vim:
+- switch to normal mode
 
-`[Esc] (to switch to normal mode), then :q`
+`<esc>`
+
+- switch to insert mode
+
+`<esc> i <enter>`
+
+- exit vim
+
+`<esc> :q <enter>`
 
 - save file in vim
 
-`[Esc] (to switch to normal mode), then :w`
+`<esc> :w <enter>`
 
 - save file then exit vim
 
-`[Esc] (to switch to normal mode), then :wq`
-
-- switch to edit (insert) mode
-
-`[Esc] (to switch to normal mode), then i`
+`<esc> :wq <enter>`

From 1f0970401fc01544e3c37ccdb35b3c62c0fe2444 Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldyrious@gmail.com>
Date: Sat, 6 Aug 2016 14:29:34 +0100
Subject: [PATCH 4/5] vim.md: apply formatting conventions

---
 pages/common/vim.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/common/vim.md b/pages/common/vim.md
index b7f4dd323..0b2adff07 100644
--- a/pages/common/vim.md
+++ b/pages/common/vim.md
@@ -14,22 +14,22 @@
 
 `view {{file}}`
 
-- switch to normal mode
+- Switch to normal mode:
 
 `<esc>`
 
-- switch to insert mode
+- Switch to insert mode:
 
 `<esc> i <enter>`
 
-- exit vim
+- Exit vim:
 
 `<esc> :q <enter>`
 
-- save file in vim
+- Save file in vim:
 
 `<esc> :w <enter>`
 
-- save file then exit vim
+- Save file then exit vim:
 
 `<esc> :wq <enter>`

From 4732cbbc934795de18f38af6464cedd27ab24d79 Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldyrious@gmail.com>
Date: Sat, 6 Aug 2016 14:34:25 +0100
Subject: [PATCH 5/5] vim.md: apply fix per code review comments

---
 pages/common/vim.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/common/vim.md b/pages/common/vim.md
index 0b2adff07..87d480505 100644
--- a/pages/common/vim.md
+++ b/pages/common/vim.md
@@ -20,7 +20,7 @@
 
 - Switch to insert mode:
 
-`<esc> i <enter>`
+`<esc> i`
 
 - Exit vim: