Merge branch 'master' into gh-pages

index.html

@@ -1555,7 +1555,7 @@ <h2 id="Collection">Backbone.Collection</h2>
       triggered on the collection directly, for convenience.
       This allows you to listen for changes to specific attributes in any
       model in a collection, for example:
-      <tt>Documents.on("change:selected", ...)</tt>
+      <tt>documents.on("change:selected", ...)</tt>
     </p>
 
     <p id="Collection-extend">
@@ -1813,7 +1813,7 @@ <h2 id="Collection">Backbone.Collection</h2>
     </p>
 
 <pre>
-var book = Library.get(110);
+var book = library.get(110);
 </pre>
 
     <p id="Collection-at">
@@ -1931,7 +1931,7 @@ <h2 id="Collection">Backbone.Collection</h2>
       <b class="header">pluck</b><code>collection.pluck(attribute)</code>
       <br />
       Pluck an attribute from each model in the collection. Equivalent to calling
-      <tt>map</tt>, and returning a single attribute from the iterator.
+      <tt>map</tt> and returning a single attribute from the iterator.
     </p>
 
 <pre class="runnable">
@@ -2055,13 +2055,13 @@ <h2 id="Collection">Backbone.Collection</h2>
       <a href="#Collection-set">set</a> options. For example, to fetch a
       collection, getting an <tt>"add"</tt> event for every new model, and
       a <tt>"change"</tt> event for every changed existing model, without
-      removing anything: <tt>collection.fetch({set: true, remove: false})</tt>
+      removing anything: <tt>collection.fetch({remove: false})</tt>
     </p>
 
     <p>
       <b>jQuery.ajax</b> options can also be passed directly as <b>fetch</b> options,
       so to fetch a specific page of a paginated collection:
-      <tt>Documents.fetch({data: {page: 3}})</tt>
+      <tt>documents.fetch({data: {page: 3}})</tt>
     </p>
 
     <p>
@@ -2450,7 +2450,7 @@ <h2 id="Sync">Backbone.sync</h2>
       encoded as <tt>application/json</tt>, setting <tt>Backbone.emulateJSON = true;</tt>
       will cause the JSON to be serialized under a <tt>model</tt> parameter, and
       the request to be made with a <tt>application/x-www-form-urlencoded</tt>
-      mime type, as if from an HTML form.
+      MIME type, as if from an HTML form.
     </p>
 
     <h2 id="View">Backbone.View</h2>
@@ -2525,7 +2525,7 @@ <h2 id="View">Backbone.View</h2>
     </p>
 
 <pre>
-var doc = Documents.first();
+var doc = documents.first();
 
 new DocumentRow({
   model: doc,
@@ -3204,7 +3204,7 @@ <h2 id="examples-stripe">Stripe</h2>
       <a href="https://stripe.com">Stripe</a> provides an API for accepting
       credit cards on the web. Stripe's
       <a href="https://manage.stripe.com">management interface</a> was recently
-      rewritten from scratch in Coffeescript using Backbone.js as the primary
+      rewritten from scratch in CoffeeScript using Backbone.js as the primary
       framework, <a href="https://github.com/sstephenson/eco">Eco</a> for templates, <a href="http://sass-lang.com/">Sass</a> for stylesheets, and <a href="https://github.com/sstephenson/stitch">Stitch</a> to package
       everything together as <a href="http://commonjs.org/">CommonJS</a> modules. The new app uses
       <a href="https://stripe.com/docs/api">Stripe's API</a> directly for the
@@ -3286,7 +3286,7 @@ <h2 id="examples-artsy">Art.sy</h2>
       love. Art.sy is built on Rails, using
       <a href="https://github.com/intridea/grape">Grape</a> to serve a robust
       <a href="http://artsy.net/api">JSON API</a>. The main site is a single page
-      app written in Coffeescript and uses Backbone to provide structure around
+      app written in CoffeeScript and uses Backbone to provide structure around
       this API. An admin panel and partner CMS have also been extracted into
       their own API-consuming Backbone projects.
     </p>
@@ -3349,7 +3349,7 @@ <h2 id="examples-code-school">Code School</h2>
       everything it has to offer: the router, collections, models, and complex
       event handling. Before, the page was a mess of <a href="http://jquery.com/">jQuery</a> DOM manipulation
       and manual Ajax calls. Backbone.js helped introduce a new way to
-      think about developing an organized front-end application in Javascript.
+      think about developing an organized front-end application in JavaScript.
     </p>
 
     <div style="text-align: center;">
@@ -3416,11 +3416,11 @@ <h2 id="examples-prose">Prose</h2>
     <p>
       <a href="http://prose.io">Prose</a> is a content editor for GitHub,
       optimized for managing websites built with
-      <a href="http://jekyllrb.com/">Jekyll</a> and Github Pages. Prose is
+      <a href="http://jekyllrb.com/">Jekyll</a> and GitHub Pages. Prose is
       itself implemented as a static Jekyll site, using Backbone.js to render
       the views and handle the routes, as well as
       <a href="http://github.com/michael/github">Github.js</a>, a small data
-      abstraction layer for manipulating files directly on Github. Read more in the
+      abstraction layer for manipulating files directly on GitHub. Read more in the
       <a href="http://developmentseed.org/blog/2012/june/25/prose-a-content-editor-for-github/">official introduction post</a>,
       or <a href="https://github.com/prose/prose">take a look at the source code</a>.
     </p>
@@ -3612,7 +3612,7 @@ <h2 id="faq">F.A.Q.</h2>
         <a href="http://mustache.github.com">way</a>.
       </li>
       <li>
-        It's smaller. There's fewer kilobytes for your browser or phone to download,
+        It's smaller. There are fewer kilobytes for your browser or phone to download,
         and less <i>conceptual</i> surface area. You can read and understand
         the source in an afternoon.
       </li>