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

README.md

@@ -56,7 +56,7 @@ Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working
 From the command line:
 
 1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
-2. From the root `/bootstrap` directory, install the [necessary local dependencies](package.json) via `npm install`.
+2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](package.json) and automatically install the necessary local dependencies listed there.
 
 When completed, you'll be able to run the various Grunt commands provided from the command line.
 

getting-started.html

@@ -37,7 +37,7 @@ base_url: "../"
     </div>
 
     <h3 id="download-cdn">Bootstrap CDN</h3>
-    <p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links.</p>
+    <p>The folks over at <a href="http://www.maxcdn.com/">MaxCDN</a> graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links.</p>
 {% highlight html %}
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="{{ site.cdn_css }}">
@@ -673,7 +673,7 @@ bootstrap/
       <li>Internet Explorer</li>
       <li>Opera (Mac, Windows)</li>
     </ul>
-    <p>Unofficially, Bootstrap should look and behave well enough in Chromium for Linux, Firefox for Linux, and Internet Explorer 7, though they are not officially supported.</p>
+    <p>Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 7, though they are not officially supported.</p>
 
     <h3>Internet Explorer 8 and 9</h3>
     <p>Internet Explorer 8 and 9 are also supported, however, please be aware that some CSS3 properties and HTML5 elements are not fully supported by these browsers. In addition, <strong>Internet Explorer 8 requires the use of <a href="https://github.com/scottjehl/Respond">respond.js</a> to enable media query support.</strong></p>

javascript.html

@@ -1111,7 +1111,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
             <td>selector</td>
             <td>string</td>
             <td>false</td>
-            <td>if a selector is provided, tooltip objects will be delegated to the specified targets if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
+            <td>if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
           </tr>
           <tr>
             <td>trigger</td>

less/mixins.less

@@ -559,8 +559,8 @@
 }
 
 .responsive-invisibility() {
-  display: none !important;
+	&,
-  tr& { display: none !important; }
+  tr&,
   th&,
   td& { display: none !important; }
 }

package.json

@@ -3,7 +3,7 @@
   , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
   , "version": "3.0.0"
   , "keywords": ["bootstrap", "css"]
-  , "homepage": "http://twbs.github.com/bootstrap/"
+  , "homepage": "http://getbootstrap.com"
   , "author": "Twitter, Inc."
   , "scripts": { "test": "grunt test" }
   , "repository": {
@@ -22,7 +22,7 @@
   , "devDependencies": {
       "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
-    , "grunt-contrib-connect": "~0.4.1"
+    , "grunt-contrib-connect": "~0.5.0"
     , "grunt-contrib-concat": "~0.3.0"
     , "grunt-contrib-copy": "~0.4.1"
     , "grunt-contrib-jshint": "~0.6.4"