# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1350083495 14400
# Node ID d6110e1c1451474837c81261cab4cc31327b0ce0
# Parent  8da4158741c9fce135cedc8132265ee8f17a3ba1# Parent  8825c740bb7c85be290f57832fdfc68aa93185f7
Merge.

diff -r 8da4158741c9 -r d6110e1c1451 chapters/17.markdown
--- a/chapters/17.markdown	Fri Oct 12 19:09:07 2012 -0400
+++ b/chapters/17.markdown	Fri Oct 12 19:11:35 2012 -0400
@@ -60,7 +60,7 @@
     :::vim
     :set statusline=%4l
 
-The line number in the status line will now be proceeded by enough spaces to
+The line number in the status line will now be preceded by enough spaces to
 make it at least four characters wide (for example: "  12").  This can be useful
 to prevent the text in the status line from shifting around distractingly.
 
diff -r 8da4158741c9 -r d6110e1c1451 chapters/18.markdown
--- a/chapters/18.markdown	Fri Oct 12 19:09:07 2012 -0400
+++ b/chapters/18.markdown	Fri Oct 12 19:11:35 2012 -0400
@@ -58,8 +58,8 @@
     :::vim
     " Vimscript file settings ---------------------- {{{
     augroup filetype_vim
-        au!
-        au FileType vim setlocal foldmethod=marker
+        autocmd!
+        autocmd FileType vim setlocal foldmethod=marker
     augroup END
     " }}}