# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1338671898 14400
# Node ID fd07be518d4639afab9212143f64310a783d654f
# Parent  90badcd0796927270c2d6f32609ff8e895fdbe97# Parent  d7ce6dbc63d385f9ed2f762f9dcd054258a82b34
Merge.

diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/07.markdown
--- a/chapters/07.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/07.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -74,7 +74,7 @@
 your work, it takes ten seconds.
 
 Assuming you charge $100 per hour for freelance work, you've got to make up one
-an a half hours of time for this investment to be worthwhile.  If you're saving
+and a half hours of time for this investment to be worthwhile.  If you're saving
 50 seconds per photo, you need to take about 109 photos for project to pay for
 itself.
 
diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/14.markdown
--- a/chapters/14.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/14.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -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 d7ce6dbc63d3 -r fd07be518d46 chapters/15.markdown
--- a/chapters/15.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/15.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -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)
diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/22.markdown
--- a/chapters/22.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/22.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -90,7 +90,7 @@
 Run the following command:
 
     :::vim
-    :set ignorecase
+    :set noignorecase
     :if "foo" ==? "FOO"
     :    echom "first"
     :elseif "foo" ==? "foo"
diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/28.markdown
--- a/chapters/28.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/28.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -45,7 +45,7 @@
 
 Contrast this with other languages, where programs constantly take input from
 untrusted users.  Vim is a unique environment where the normal security concerns
-simple aren't common.
+simply aren't common.
 
 The second reason is that because Vimscript has sometimes arcane and tricky
 syntax, `execute` is often the easiest, most straightforward way to get
diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/43.markdown
--- a/chapters/43.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/43.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -108,7 +108,7 @@
 Exercises
 ---------
 
-Install Pathogen if you haven't already done so.
+Install [Pathogen][] if you haven't already done so.
 
 Create a Mercurial or Git repository for your plugin, called `potion`.  You can
 put it anywhere you like and symlink it into `~/.vim/bundle/potion/` or just put
diff -r d7ce6dbc63d3 -r fd07be518d46 chapters/51.markdown
--- a/chapters/51.markdown	Sat Apr 21 02:48:14 2012 +0100
+++ b/chapters/51.markdown	Sat Jun 02 17:18:18 2012 -0400
@@ -87,7 +87,7 @@
 mappings will call.
 
 You'll see this strategy in a lot of Vim plugins that create a number of similar
-mappings.  It's easier to read and maintain then stuffing all the functionality
+mappings.  It's easier to read and maintain than stuffing all the functionality
 in to a bunch of mapping lines.
 
 Change the `sections.vim` file to contain this:
@@ -298,7 +298,7 @@
         execute 'silent normal! ' . dir . pattern . dir . flags . "\r"
     endfunction
 
-Two things have changed.  First, the function takes an extra argument so it know
+Two things have changed.  First, the function takes an extra argument so it knows
 whether it's being called from visual mode or not.  Second, if it's called from
 visual mode we run `gv` to restore the visual selection.