Merge 'upstream/master' into internal/master

jasonrudolph · jasonrudolph · commit 949e65dea9f8 · 2013-12-26T17:06:35.000-05:00
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ All submissions are welcome. To submit a change, fork this repo, commit your cha
 
 Ruby 1.9 is required to build the site.
 
-Get the nanoc gem, plus kramdown for markdown parsing:
+Get the nanoc gem, plus kramdown for Markdown parsing:
 
 ```sh
 $ bundle install
@@ -59,7 +59,7 @@ API docs should look like:
 
 ### JSON Responses
 
-We specify the JSON responses in ruby so that we don't have to write
+We specify the JSON responses in Ruby so that we don't have to write
 them by hand all over the docs.  You can render the JSON for a resource
 like this:
 
@@ -77,8 +77,8 @@ Some actions return arrays.  You can modify the JSON by passing a block:
 
 ### Terminal blocks
 
-You can specify terminal blocks with `pre.terminal` elements.  It'd be
-nice if Markdown could do this more cleanly...
+You can specify terminal blocks with `pre.terminal` elements.  (It'd be
+nice if Markdown could do this more cleanly.)
 
 ```html
 <pre class="terminal">
@@ -87,7 +87,7 @@ $ curl foobar
 </pre>
 ```
 
-This isn't a `curl` tutorial though, I'm not sure every API call needs
+This is not a `curl` tutorial though. Not every API call needs
 to show how to access it with `curl`.
 
 ## Development
@@ -116,8 +116,8 @@ Compiling site...
 Site compiled in 5.81s.
 ```
 
-You can setup whatever you want to view the files.  If you have the adsf
-gem, however (I hope so, it was in the Gemfile), you can start Webrick:
+You can setup whatever you want to view the files. If using the adsf
+gem (as listed in the Gemfile), you can start Webrick:
 
 ```sh
 $ bundle exec nanoc view
