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

docs/assets/js/bootstrap.js

@@ -442,7 +442,7 @@
     $target.carousel(options)
 
     if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs-carousel').pause().to(slideIndex).cycle()
+      $target.data('bs.carousel').pause().to(slideIndex).cycle()
     }
 
     e.preventDefault()

docs/getting-started.html

@@ -116,7 +116,8 @@ bootstrap/
 {% endhighlight %}
 
     <h3 id="examples-list">Examples</h3>
-    <div class="row bs-examples">
+    <div class="bs-examples">
+      <div class="row">
         <div class="col col-lg-4">
           <a class="thumbnail" href="/examples/starter-template/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
@@ -138,6 +139,8 @@ bootstrap/
           <h4>Basic marketing site</h4>
           <p>Features a jumbotron for primary message and three supporting elements.</p>
         </div>
+      </div>
+      <div class="row">
         <div class="col col-lg-4">
           <a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt="">
@@ -159,6 +162,8 @@ bootstrap/
           <h4>Sign in</h4>
           <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
         </div>
+      </div>
+      <div class="row">
         <div class="col col-lg-4">
           <a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
@@ -180,7 +185,8 @@ bootstrap/
           <h4>Carousel jumbotron</h4>
           <p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
         </div>
-
+      </div>
+      <div class="row">
         <div class="col col-lg-4">
           <a class="thumbnail" href="/examples/navbar/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
@@ -204,6 +210,7 @@ bootstrap/
         </div>
       </div>
     </div>
+  </div>
 
 
 

js/carousel.js

@@ -194,7 +194,7 @@
     $target.carousel(options)
 
     if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs-carousel').pause().to(slideIndex).cycle()
+      $target.data('bs.carousel').pause().to(slideIndex).cycle()
     }
 
     e.preventDefault()