Merge branch 'master' of github.com:twbs/bootstrap

1 files changed, 5 insertions, 5 deletions

diff --git a/components.html b/components.html
index 627327647..c2e0e261a 100644
--- a/components.html
+++ b/components.html
@@ -558,9 +558,9 @@ base_url: "../"
 
     <div class="bs-example">
       <div class="btn-group btn-group-justified">
-        <button type="button" class="btn btn-default">Left</button>
-        <button type="button" class="btn btn-default">Middle</button>
-        <button type="button" class="btn btn-default">Right</button>
+        <a class="btn btn-default" role="button">Left</a>
+        <a class="btn btn-default" role="button">Middle</a>
+        <a class="btn btn-default" role="button">Right</a>
       </div>
     </div>
 {% highlight html %}
@@ -2209,13 +2209,13 @@ body { padding-bottom: 70px; }
     <h2 id="alerts-dismissable">Dismissable alerts</h2>
     <p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p>
     <div class="bs-example">
-      <div class="alert alert-dismissable">
+      <div class="alert alert-warning alert-dismissable">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
         <strong>Warning!</strong> Best check yo self, you're not looking too good.
       </div>
     </div>
 {% highlight html %}
-<div class="alert alert-dismissable">
+<div class="alert alert-warning alert-dismissable">
   <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>