From: Mark Otto <otto@github.com>
Date: Tue, 3 Sep 2013 22:50:44 +0000 (-0700)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.0.1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=171fc396ac1774c121154f5994dea5834496d196;p=thirdparty%2Fbootstrap.git

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

171fc396ac1774c121154f5994dea5834496d196
diff --cc getting-started.html
index 091c71c2b9,3ded19005c..65c0796f44
--- a/getting-started.html
+++ b/getting-started.html
@@@ -705,11 -708,8 +705,11 @@@ 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>
 +
      <h3>IE Compatibility modes</h3>
      <p>Bootstrap is not supported in the old Internet Explorer compatibility modes. To be sure you're using the latest rendering mode for IE, consider including the appropriate <code>&lt;meta&gt;</code> tag in your pages:</p>
  {% highlight html %}