aboutsummaryrefslogtreecommitdiff
path: root/getting-started.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-16 18:59:06 -0700
committerMark Otto <[email protected]>2013-09-16 18:59:06 -0700
commitc14fe7904acebcd6a07335ab6d9028dcecc976f0 (patch)
treea37b51775f5f80650cc5ba456c091f4a9a3d0d0d /getting-started.html
parent776d3fd6a0b0803512ba3cf5bd365b4e18b9315f (diff)
parent630bf13fb4b9f5b92e323504454a8f9d18d93d59 (diff)
downloadbootstrap-c14fe7904acebcd6a07335ab6d9028dcecc976f0.tar.xz
bootstrap-c14fe7904acebcd6a07335ab6d9028dcecc976f0.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'getting-started.html')
-rw-r--r--getting-started.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/getting-started.html b/getting-started.html
index ddd8ebc9f..f465a67eb 100644
--- a/getting-started.html
+++ b/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>