Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

css.html

@@ -84,7 +84,7 @@ base_url: "../"
     <p class="lead">Bootstrap includes a responsive, mobile-first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p>
 
     <h3 id="grid-media-queries">Media queries</h3>
-    <p>We use the following media queries to create our the key breakpoints in our grid system.</p>
+    <p>We use the following media queries to create the key breakpoints in our grid system.</p>
 {% highlight css %}
 /* Extra small devices (phones, up to 480px) */
 /* No media query since this is the default in Bootstrap */
@@ -98,7 +98,7 @@ base_url: "../"
 /* Large devices (large desktops, 1200px and up) */
 @media (min-width: @screen-large-desktop) { ... }
 {% endhighlight %}
-    <p>We ocassionally expand on these media queries to include a <code>max-width</code> to limit CSS to a narrower set of devices.</p>
+    <p>We occasionally expand on these media queries to include a <code>max-width</code> to limit CSS to a narrower set of devices.</p>
 {% highlight css %}
 @media (max-width: @screen-phone-max) { ... }
 @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { ... }