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

javascript.html

@@ -1183,7 +1183,7 @@ $('#myPopover').on('hidden.bs.popover', function () {
     </div><!-- /example -->
 
     <div class="bs-example">
-      <div class="alert alert-block alert-error fade in">
+      <div class="alert alert-block alert-danger fade in">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
         <h4>Oh snap! You got an error!</h4>
         <p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>