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

1 files changed, 2 insertions, 18 deletions

diff --git a/components.html b/components.html
index 2b0d96bc0..13a8da2b3 100644
--- a/components.html
+++ b/components.html
@@ -203,8 +203,8 @@ base_url: "../"
     <div class="bs-example">
       <div class="btn-group btn-group-justified">
         <a href="#" class="btn btn-default">Left</a>
-        <a href="#" class="btn btn-default">Right</a>
         <a href="#" class="btn btn-default">Middle</a>
+        <a href="#" class="btn btn-default">Right</a>
       </div>
     </div>
 {% highlight html %}
@@ -782,6 +782,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
+</div>
 
 
 
@@ -1814,23 +1815,6 @@ body { padding-bottom: 70px; }
 </div>
 {% endhighlight %}
 
-    <h3 id="alerts-block">Block alerts</h3>
-    <p>For longer messages, increase the padding on the top and bottom of the alert wrapper by adding <code>.alert-block</code>.</p>
-    <div class="bs-example">
-      <div class="alert alert-block">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <h4>Warning!</h4>
-        <p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-      </div>
-    </div>
-{% highlight html %}
-<div class="alert alert-block">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <h4>Warning!</h4>
-  <p>...</p>
-</div>
-{% endhighlight %}
-
     <h3 id="alerts-alternatives">Contextual alternatives</h3>
     <p>Add optional classes to change an alert's connotation.</p>
     <div class="bs-example">