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

assets/css/docs.css

@@ -1022,7 +1022,7 @@ h1[id] {
 }
 .bs-customizer .bs-callout h4 {
   margin-top: 0; /* lame, but due to specificity we have to duplicate */
-  magin-bottom: 5px;
+  margin-bottom: 5px;
 }
 .bs-customizer input[type="text"] {
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;

components.html

@@ -977,7 +977,7 @@ base_url: "../"
 {% highlight html %}
 <div class="input-group input-group-lg">
   <span class="input-group-addon">@</span>
-  <input type="text" class="form-control input-lg" placeholder="Username">
+  <input type="text" class="form-control" placeholder="Username">
 </div>
 
 <div class="input-group">

less/alerts.less

@@ -15,7 +15,7 @@
   // Headings for larger alerts
   h4 {
     margin-top: 0;
-    // Specified for the h4 to prevent conflicts of changing @headingsColor
+    // Specified for the h4 to prevent conflicts of changing @headings-color
     color: inherit;
   }
   // Provide class for links that match alerts