vim: Normal mode is the normal mode (#1106)

* vim: Improvements we can can agree on

Remove spaces between keypresses (as it could lead users to think they
should type a space there).
Simplify regexp substitution example.
Add ...then... to search example.
Add quit without saving example.

* vim: Improvements we can can agree on

Move search keystrokes to the example title.
Keep original regexp substitution example. See conversation starting at
ee1472e76f (r82820204)

pages/common/vim.md

@@ -1,7 +1,7 @@
 # vim
 
 > Vi IMproved, a programmer's text editor, providing several modes for different kinds of text manipulation.
-> Pressing `i` enters edit mode; the normal mode (accessed via `<Esc>`) doesn't allow regular text editing.
+> Pressing `i` enters edit mode. `<Esc>` goes back to normal mode, which doesn't allow regular text insertion.
 
 - Open a file:
 
@@ -9,24 +9,28 @@
 
 - Enter text editing mode (insert mode):
 
-`<Esc> i`
+`<Esc>i`
 
 - Copy ("yank") or cut ("delete") the current line (paste it with `P`):
 
-`<Esc> {{yy|dd}}`
+`<Esc>{{yy|dd}}`
 
 - Undo the last operation:
 
-`<Esc> u`
+`<Esc>u`
 
-- Search for a pattern in the file (press `n` to go to the next result):
+- Search for a pattern in the file (press `n`/`N` to go to next/previous match):
 
-`<Esc> /{{search_pattern}} <Enter>`
+`<Esc>/{{search_pattern}}<Enter>`
 
 - Perform a regex substitution in the whole file (from the start, `1`, to the end, `$`):
 
-`<Esc> :1,$s/{{pattern}}/{{replacement}}/g <Enter>`
+`<Esc>:1,$s/{{pattern}}/{{replacement}}/g<Enter>`
 
-- Save (write) the file, and quit vim:
+- Save (write) the file, and quit:
 
-`<Esc> :wq <Enter>`
+`<Esc>:wq<Enter>`
+
+- Quit without saving:
+
+`<Esc>:q!<Enter>`