Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

_includes/ads.html

-<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
\ No newline at end of file
+<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>

_includes/footer.html

@@ -4,7 +4,7 @@
 <script src="{{ page.base_url }}assets/js/jquery.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
-<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<script src="http://platform.twitter.com/widgets.js"></script>
 <script src="{{ page.base_url }}assets/js/holder.js"></script>
 
 <script src="{{ page.base_url }}assets/js/application.js"></script>
@@ -15,7 +15,6 @@
   var _gauges = _gauges || [];
   (function() {
     var t   = document.createElement('script');
-    t.type  = 'text/javascript';
     t.async = true;
     t.id    = 'gauges-tracker';
     t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');

_includes/header.html

@@ -31,12 +31,12 @@
                 <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
                                <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
 
-<script type="text/javascript">
+<script>
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-146052-10']);
   _gaq.push(['_trackPageview']);
   (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    var ga = document.createElement('script'); ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();

css.html

@@ -148,8 +148,8 @@ base_url: "../"
           </tr>
           <tr>
             <th>Offsets</th>
-            <td colspan="2" class="text-muted">N/A</td>
-            <td colspan="2">Yes</td>
+            <td colspan="1" class="text-muted">N/A</td>
+            <td colspan="3">Yes</td>
           </tr>
           <tr>
             <th>Column ordering</th>