# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1481833330 18000
# Node ID 1009a81ff8d6eb87ebeb00cd360b772c422765bc
# Parent  c6cd81623f93d1cd62e191519b88f4ede091bc46# Parent  c83035f5644b66eab92dc93f3c1462948f237a9c
Merge.

diff -r c6cd81623f93 -r 1009a81ff8d6 chapters/01.markdown
--- a/chapters/01.markdown	Sun Nov 20 11:58:14 2016 +0000
+++ b/chapters/01.markdown	Thu Dec 15 15:22:10 2016 -0500
@@ -60,7 +60,7 @@
 
 Read `:help echom`.
 
-Read `:help messages`.
+Read `:help :messages`.
 
 Add a line to your `~/.vimrc` file that displays a friendly ASCII-art cat
 (`>^.^<`) whenever you open Vim.
diff -r c6cd81623f93 -r 1009a81ff8d6 chapters/42.markdown
--- a/chapters/42.markdown	Sun Nov 20 11:58:14 2016 +0000
+++ b/chapters/42.markdown	Thu Dec 15 15:22:10 2016 -0500
@@ -21,7 +21,7 @@
 
 I've been using the word "plugin" to mean "a big ol' hunk of Vimscript that does
 a bunch of related stuff".  Vim has a more specific meaning of "plugin", which
-is "a file in `~/.vim/plugins/`".
+is "a file in `~/.vim/plugin/`".
 
 Most of the time I'll be using the first definition.  I'll try to be clear when
 I mean the second.