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

components.html

@@ -558,9 +558,9 @@ <h4>Element-specific usage</h4>
 
     <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 @@ <h4>No default class</h4>
     <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>

customize.html

@@ -13,7 +13,7 @@
       <button class="btn btn-default toggle" type="button">Toggle all</button>
       <h1 id="less">LESS files</h1>
     </div>
-    <p class="lead">Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="../css/">CSS</a> and <a href="../components/">Components</a> pages in the docs</p>
+    <p class="lead">Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="../css/">CSS</a> and <a href="../components/">Components</a> pages in the docs.</p>
 
     <div class="row">
       <div class="col-xs-6 col-sm-4">

getting-started.html

@@ -72,10 +72,10 @@ <h1 id="whats-included">What's included</h1>
 │   ├── bootstrap.css
 │   ├── bootstrap.min.css
 │   ├── bootstrap-theme.css
-│   ├── bootstrap-theme.min.css
+│   └── bootstrap-theme.min.css
 ├── js/
 │   ├── bootstrap.js
-│   ├── bootstrap.min.js
+│   └── bootstrap.min.js
 └── fonts/
     ├── glyphicons-halflings-regular.eot
     ├── glyphicons-halflings-regular.svg

package.json

@@ -10,6 +10,9 @@
       "type": "git"
     , "url": "https://github.com/twbs/bootstrap.git"
   }
+  , "bugs": {
+      "url": "https://github.com/twbs/bootstrap/issues"
+  }
   , "licenses": [
     {
         "type": "Apache-2.0"