c1302fc8b9d0
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 22 Apr 2012 13:36:31 +0100 |
parents | c3b3b48d8f51 (diff) ac15261ccd97 (current diff) |
children | 17ece76ba98a |
branches/tags | (none) |
files |
Changes
--- a/chapters/07.markdown Tue Apr 17 19:13:27 2012 -0400 +++ b/chapters/07.markdown Sun Apr 22 13:36:31 2012 +0100 @@ -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.
--- a/chapters/14.markdown Tue Apr 17 19:13:27 2012 -0400 +++ b/chapters/14.markdown Sun Apr 22 13:36:31 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
--- a/chapters/15.markdown Tue Apr 17 19:13:27 2012 -0400 +++ b/chapters/15.markdown Sun Apr 22 13:36:31 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) @@ -104,7 +104,7 @@ perform the operator on the text inside the next set of parenthesis on the current line. -Let's make a companion "inside last parenthesis" ("previous" woud be a better +Let's make a companion "inside last parenthesis" ("previous" would be a better word, but it would shadow the "paragraph" movement). Run the following command: :::vim