# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1335097981 -3600
# Node ID c3b3b48d8f513d7561e07cada6ed7cc90e1d79df
# Parent  e34cbe30964399f9aa4b8ea7b1304a1b1194e5ac# Parent  a1d737428f72914ff8f1b06ebc8d358ac09c250e
Merge.

diff -r a1d737428f72 -r c3b3b48d8f51 chapters/14.markdown
--- a/chapters/14.markdown	Thu Apr 19 20:49:59 2012 -0700
+++ b/chapters/14.markdown	Sun Apr 22 13:33:01 2012 +0100
@@ -51,7 +51,7 @@
 Write the file again.  This time the slowness will be more apparent.
 
 Obviously you won't have any autocommands that do nothing but sleep, but the
-`~/.vimrc` of a seasoned Vim user can easy reach 1,000 lines, many of which will
+`~/.vimrc` of a seasoned Vim user can easily reach 1,000 lines, many of which will
 be autocommands.  Combine that with autocommands defined in any installed
 plugins and it can definitely affect performance.
 
@@ -114,7 +114,7 @@
 this to add autocommands to `~/.vimrc` that don't add a duplicate every time we
 source it.
 
-Add the follow to your `~/.vimrc` file:
+Add the following to your `~/.vimrc` file:
 
     :::vim
     augroup filetype_html
diff -r a1d737428f72 -r c3b3b48d8f51 chapters/15.markdown
--- a/chapters/15.markdown	Thu Apr 19 20:49:59 2012 -0700
+++ b/chapters/15.markdown	Sun Apr 22 13:33:01 2012 +0100
@@ -26,7 +26,7 @@
     :::vim
     :onoremap p i(
 
-Now type the follow text into a buffer:
+Now type the following text into a buffer:
 
     :::python
     return person.get_pets(type="cat", fluffy_only=True)
@@ -104,7 +104,7 @@
 perform the operator on the text inside the next set of parenthesis on the
 current line.
 
-Let's make a companion "inside last parenthesis" ("previous" woud be a better
+Let's make a companion "inside last parenthesis" ("previous" would be a better
 word, but it would shadow the "paragraph" movement).  Run the following command:
 
     :::vim