Merge branch 'bs3_rc1' into 3.0.0-wip

docs/css.html → css.html

@@ -2,7 +2,7 @@
 layout: default
 title: CSS
 slug: css
-lead: "Fundamental HTML elements styled and enhanced with extensible classes."
+lead: "Global CSS settings, fundamental HTML elements styled and enhanced with extensible classes, and an advanced grid system."
 ---
 
 

docs/customize.html → customize.html

@@ -1155,7 +1155,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p>
       <div class="bs-customize-download">
-        <a class="btn" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
+        <a class="btn btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
       </div>
       <div class="bs-callout bs-callout-danger">
         <h4>What's included?</h4>

docs/index.html → index.html

@@ -3,13 +3,22 @@ layout: home
 title: Bootstrap
 ---
 
+<div class="bs-old-docs">
+  <div class="container">
+    <strong>
+      <a href="/2.3.2/">Looking for Bootstrap 2.3.2 docs?</a>
+    </strong>
+    We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog post</a> for details.
+  </div>
+</div>
+
 <div class="container">
   <div class="bs-masthead">
 
-    <h1>Bootstrap</h1>
+    <h1>Bootstrap 3</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
     <p>
-      <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
+      <a href="assets/bootstrap.zip" class="btn btn-bs btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap 3.0.0 RC1</a>
     </p>
 
     {% include social-buttons.html %}
@@ -27,7 +36,6 @@ title: Bootstrap
       <li>
         <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
       </li>
-      <li>Version 3.0.0</li>
     </ul>
 
   </div>