# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1479641705 0
# Node ID b5fbfe6dc8794f2541f983557ae28009d0bb2361
# Parent  cacf10f606ba0edaf4a5e8e97b16b7890de69784# Parent  1b0acafc059156790a972fb5f0d59f3e6f067db6
Merge.

diff -r 1b0acafc0591 -r b5fbfe6dc879 acknowledgements.markdown
--- a/acknowledgements.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/acknowledgements.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -16,23 +16,26 @@
 * [chiphogg](https://github.com/chiphogg)
 * [ciwchris](https://github.com/ciwchris)
 * [cwarden](https://github.com/cwarden)
+* [danderss](https://bitbucket.org/danderss/)
 * [dmedvinsky](https://github.com/dmedvinsky)
 * [flatcap](https://github.com/flatcap)
 * [helixbass](https://bitbucket.org/helixbass)
 * [hoelzro](https://github.com/hoelzro)
+* [jlmuir](https://bitbucket.org/jlmuir/)
 * [jrib](https://github.com/jrib)
 * [lheiskan](https://github.com/lheiskan)
 * [lightningdb](https://github.com/lightningdb)
 * [manojkumarm](https://github.com/manojkumarm)
-* [manojkumarm](https://github.com/manojkumarm)
 * [markscholtz](https://github.com/markscholtz)
 * [marlun](https://github.com/marlun)
+* [martica](https://github.com/martica)
 * [mattsacks](https://github.com/mattsacks)
 * [Mr-Happy](https://github.com/Mr-Happy)
 * [mrgrubb](https://github.com/mrgrubb)
 * [NagatoPain](https://github.com/NagatoPain)
 * [nathanaelkane](https://github.com/nathanaelkane)
 * [nielsbom](https://github.com/nielsbom)
+* [nkalvi](https://github.com/nkalvi)
 * [nvie](https://github.com/nvie)
 * [Psycojoker](https://github.com/Psycojoker)
 * [riceissa](https://github.com/riceissa)
diff -r 1b0acafc0591 -r b5fbfe6dc879 chapters/11.markdown
--- a/chapters/11.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/chapters/11.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -40,7 +40,7 @@
 
 When you typed `<leader>x` in file `bar` Vim couldn't find a mapping that
 matched it, so it treated it as two commands: `<leader>` (which does nothing on
-its own) and `x` (the normal command to delete a single character.)
+its own) and `x` (the normal command to delete a single character).
 
 Local Leader
 ------------
diff -r 1b0acafc0591 -r b5fbfe6dc879 chapters/15.markdown
--- a/chapters/15.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/chapters/15.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -144,7 +144,7 @@
 -------------
 
 A good way to keep the multiple ways of creating operator-pending mappings
-straight is the remember the following two rules:
+straight is to remember the following two rules:
 
 * If your operator-pending mapping ends with some text visually selected, Vim
   will operate on that text.
diff -r 1b0acafc0591 -r b5fbfe6dc879 chapters/20.markdown
--- a/chapters/20.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/chapters/20.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -25,7 +25,7 @@
 
 Vim has many different scopes for variables, but we need to learn a little more
 about Vimscript before we can take advantage of the rest.  For now, just
-remember that when you see a variable that start with a character and a colon
+remember that when you see a variable that starts with a character and a colon
 that it's describing a scoped variable.
 
 Exercises
diff -r 1b0acafc0591 -r b5fbfe6dc879 chapters/23.markdown
--- a/chapters/23.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/chapters/23.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -118,7 +118,7 @@
 What did we do here?
 
 * First we set the `textwidth` globally to `80`.
-* The we ran an if statement that checked if `TextwidthIsTooWide()` was truthy.
+* Then we ran an if statement that checked if `TextwidthIsTooWide()` was truthy.
 * This wound up not being the case, so the `if`'s body wasn't executed.
 
 Because we never explicitly returned a value, Vim returned `0` from the
diff -r 1b0acafc0591 -r b5fbfe6dc879 chapters/31.markdown
--- a/chapters/31.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/chapters/31.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -184,7 +184,7 @@
 Read `:help pattern-overview` to see the kinds of things Vim regexes support.
 Stop reading after the character classes.
 
-Read `:help match`.  Try running the `:match Error /\v.../` command a few times
+Read `:help :match`.  Try running the `:match Error /\v.../` command a few times
 by hand.
 
 Edit your `~/.vimrc` file to add a mapping that will use `match` to highlight
diff -r 1b0acafc0591 -r b5fbfe6dc879 introduction.markdown
--- a/introduction.markdown	Fri Jul 25 13:47:21 2014 -0400
+++ b/introduction.markdown	Sun Nov 20 11:35:05 2016 +0000
@@ -29,12 +29,6 @@
 [leanpub]: http://leanpub.org/learnvimscriptthehardway
 [paper]: http://bit.ly/lvsthw-paperback
 [hard]: http://bit.ly/lvsthw-hardcover
-
-The source code to the book is available [on BitBucket][hg] and [on
-GitHub][git].  If you find any mistakes or feel you could improve it feel free
-to send a pull request, but I'm retaining the copyright on the book, so if
-you're not comfortable with that I understand.
-
 [book]: http://learnvimscriptthehardway.stevelosh.com/
 [Vim]: http://www.vim.org/
 [hg]: http://bitbucket.org/sjl/learnvimscriptthehardway/