# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1335097977 -3600
# Node ID e34cbe30964399f9aa4b8ea7b1304a1b1194e5ac
# Parent  cf919ee075416e897a56fa0b75ff40e404c4f62d# Parent  1ca7450147096b74e8fbeae4581577a2cbbd80d3
Merge.

diff -r cf919ee07541 -r e34cbe309643 chapters/14.markdown
--- a/chapters/14.markdown	Thu Apr 19 21:46:48 2012 -0700
+++ b/chapters/14.markdown	Sun Apr 22 13:32:57 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 cf919ee07541 -r e34cbe309643 chapters/15.markdown
--- a/chapters/15.markdown	Thu Apr 19 21:46:48 2012 -0700
+++ b/chapters/15.markdown	Sun Apr 22 13:32:57 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)