# HG changeset patch
# User Richard Cheng <rcheng@neuratron.com>
# Date 1333628391 -3600
# Node ID 5f0854fc2f0ca9222875db1cf70164124c08975b
# Parent  70fa74df63c33a1b3fc341d5408a2bb52ff3f90d# Parent  33e01424adaa5c3f433d1a48a3032d6675f8a86f
Merge remote-tracking branch 'upstream/master'

diff -r 33e01424adaa -r 5f0854fc2f0c chapters/05.markdown
--- a/chapters/05.markdown	Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/05.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -90,7 +90,7 @@
 character.
 
 Each of the `*map` commands has a `*noremap` counterpart that ignores other
-mappings: `nnoremap`, `vnoremap`, and `inoremap`.
+mappings: `noremap`, `nnoremap`, `vnoremap`, and `inoremap`.
 
 When to Use
 -----------
@@ -102,7 +102,7 @@
 
 **No, seriously, ALWAYS.**
 
-Using a bare `nmap` is just *asking* for pain down the road when you install
+Using a bare `*map` is just *asking* for pain down the road when you install
 a plugin or add a new custom mapping.  Save yourself the trouble and type the
 extra characters to make sure it never happens.
 
diff -r 33e01424adaa -r 5f0854fc2f0c chapters/08.markdown
--- a/chapters/08.markdown	Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/08.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -89,7 +89,7 @@
 Run this command:
 
     :::vim
-    :inoremap ssig --<cr>Steve Losh<cr>steve@stevelosh.com
+    :inoremap ssig -- <cr>Steve Losh<cr>steve@stevelosh.com
 
 This is a *mapping* intended to let you insert your signature quickly.  Try it
 out by entering insert mode and typing `ssig`.
@@ -109,7 +109,7 @@
 
     :::vim
     :iunmap ssig
-    :iabbrev ssig --<cr>Steve Losh<cr>steve@stevelosh.com
+    :iabbrev ssig -- <cr>Steve Losh<cr>steve@stevelosh.com
 
 Now try out the abbreviation again.
 
diff -r 33e01424adaa -r 5f0854fc2f0c chapters/09.markdown
--- a/chapters/09.markdown	Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/09.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -76,8 +76,8 @@
 instead of double quotes.
 
 Try using `vnoremap` to add a mapping that will wrap whatever text you have
-*visually selected* in quotes.  You'll probably need the `gv` command for this,
-so read up on it with `:help gv`.
+*visually selected* in quotes.  You'll probably need the ```<`` and ```>``
+commands for this, so read up on them with ``:help `<``.
 
 Map `H` in normal mode to go to the beginning of the current line.  Since `h`
 moves left you can think of `H` as a "stronger" `h`.