Merge branch 'master' of github.com:twbs/bootstrap

css.html

@@ -2116,7 +2116,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <code>&lt;button&gt;</code> elements, this is done via <code>:active</code>. For <code>&lt;a&gt;</code> elements, it's done with <code>.active</code>. However, you may use <code>.active</code> <code>&lt;button&gt;</code>s should you need to replicate the active state progammatically.</p>
 
     <h3>Button element</h3>
-    <p>No need to add <code>:active</code> as it's a pseudo state, but if you need it, go ahead and add <code>.active</code>.</p>
+    <p>No need to add <code>:active</code> as it's a pseudo-class, but if you need to force the same appearance, go ahead and add <code>.active</code>.</p>
     <p class="bs-example">
       <button type="button" class="btn btn-primary btn-lg active">Primary button</button>
       <button type="button" class="btn btn-default btn-lg active">Button</button>

getting-started.html

@@ -705,7 +705,7 @@ bootstrap/
       </table>
     </div>
 
-    <p>Visit <a href="http://caniuse.com/">Can I use...</a> for details and additional browser support of CSS3 and HTML5 features.</p>
+    <p>Visit <a href="http://caniuse.com/">Can I use...</a> for details on browser support of CSS3 and HTML5 features.</p>
 
     <h3>Internet Explorer 8 and box-sizing</h3>
     <p>IE8 does not fully support <code>box-sizing: border-box;</code> when combined with <code>min-width</code>, <code>max-width</code>, <code>min-height</code>, and <code>max-height</code>. For that reason, as of v3.0.1, we have moved from <code>max-width</code> on <code>.container</code>s.</p>

package.json

@@ -22,7 +22,7 @@
   , "devDependencies": {
       "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
-    , "grunt-contrib-connect": "~0.3.0"
+    , "grunt-contrib-connect": "~0.4.0"
     , "grunt-contrib-concat": "~0.3.0"
     , "grunt-contrib-copy": "~0.4.0"
     , "grunt-contrib-jshint": "~0.6.0"