From: Mark Otto <otto@github.com>
Date: Thu, 18 Jul 2013 03:44:27 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' into bs3_remove_examples
X-Git-Tag: v3.0.0-rc1~150^2^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0d071832284d968f2cb72b0bb576f8112a349de;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
---

f0d071832284d968f2cb72b0bb576f8112a349de
diff --cc docs/_includes/nav-getting-started.html
index 305de607bd,bde8bf4045..022d335cd6
--- a/docs/_includes/nav-getting-started.html
+++ b/docs/_includes/nav-getting-started.html
@@@ -9,8 -9,18 +9,14 @@@
    <a href="#whats-included">What's included</a>
  </li>
  <li>
 -  <a href="#browsers">Browser support</a>
 +  <a href="#template">Basic template</a>
  </li>
+ <li>
 -  <a href="#examples">Templates and examples</a>
 -  <ul class="nav">
 -    <li><a href="#examples-template">HTML template</a></li>
 -    <li><a href="#examples-list">List of examples</a></li>
 -  </ul>
++  <a href="#browsers">Browser support</a>
+ </li>
+ <li>
+   <a href="#license-faqs">License FAQs</a>
+ </li>
  <li>
    <a href="#customizing">Customizing Bootstrap</a>
  </li>
diff --cc docs/getting-started.html
index f3258900eb,3efd00c1de..9f824ab6f1
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@@ -82,11 -81,34 +81,35 @@@ bootstrap
      </div>
    </div>
  
++
+   <!-- Browser compatibility
+   ================================================== -->
+   <div class="bs-docs-section" id="browsers">
+     <div class="page-header">
+       <h1>Browser compatibility</h1>
+     </div>
+     <p class="lead">Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older and less advanced browsers might receive a less stylized, though fully functional, version of certain components.</p>
+ 
+     <h4>Supported browsers</h4>
+     <p>Specifically, we support the latest versions of the following:</p>
+     <ul>
+       <li>Chrome (Mac, Windows, iOS, and Android)</li>
+       <li>Safari (Mac and iOS only, as Windows has more or less been discontinued)</li>
+       <li>Firefox (Mac, Windows)</li>
+       <li>Internet Explorer</li>
+       <li>Opera (Mac, Windows)</li>
+     </ul>
+     <p>Unofficially, Bootstrap should look and behave just fine in Chromium for Linux and Internet Explorer 7-8, though full support is not guaranteed.</p>
+ 
+     <h4>IE Compatibility modes</h4>
+     <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 <code>&lt;meta http-equiv="X-UA-Compatible" content="IE=edge"&gt;</code> in your pages. See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p>
+   </div>
+ 
 -  <!-- Examples
 +  <!-- Template
    ================================================== -->
 -  <div class="bs-docs-section" id="examples">
 +  <div class="bs-docs-section" id="template">
      <div class="page-header">
 -      <h1>Templates and examples</h1>
 +      <h1>Basic template</h1>
      </div>
      <p class="lead">Make use of a super basic HTML template, or dive into a few examples we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
  
diff --cc docs/index.html
index fc8e85322a,ae38cb9795..49bdcb38e8
--- a/docs/index.html
+++ b/docs/index.html
@@@ -22,8 -19,11 +19,11 @@@ title: Bootstra
          <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
        </li>
        <li>
 -        <a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
 +        <a href="http://examples.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
        </li>
+       <li>
+         <a href="http://glyphicons.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
+       </li>
        <li>
          <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
        </li>