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

Gruntfile.js

@@ -96,15 +96,24 @@ module.exports = function (grunt) {
     },
 
     uglify: {
-      options: {
-        banner: '<%= banner %>\n',
-        report: 'min'
-      },
       bootstrap: {
+        options: {
+          banner: '<%= banner %>\n',
+          report: 'min'
+        },
         src: ['<%= concat.bootstrap.dest %>'],
         dest: 'dist/js/<%= pkg.name %>.min.js'
       },
       customize: {
+        options: {
+          banner: '/*!\n' +
+          ' * Bootstrap Docs (<%= pkg.homepage %>)\n' +
+          ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+          ' * Licensed under the Creative Commons Attribution 3.0 Unported License. For\n' +
+          ' * details, see http://creativecommons.org/licenses/by/3.0/.\n' +
+          ' */\n',
+          report: 'min'
+        },
         src: [
           'docs-assets/js/less.js',
           'docs-assets/js/jszip.js',

components.html

@@ -2151,7 +2151,7 @@ body { padding-bottom: 70px; }
         <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
       </div>
       <div class="alert alert-warning">
-        <strong>Warning!</strong> Best check yo self, you're not looking too good.
+        <strong>Warning!</strong> Better check yourself, you're not looking too good.
       </div>
       <div class="alert alert-danger">
         <strong>Oh snap!</strong> Change a few things up and try submitting again.
@@ -2169,13 +2169,13 @@ body { padding-bottom: 70px; }
     <div class="bs-example">
       <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.
+        <strong>Warning!</strong> Better check yourself, you're not looking too good.
       </div>
     </div>
 {% highlight html %}
 <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.
+  <strong>Warning!</strong> Better check yourself, you're not looking too good.
 </div>
 {% endhighlight %}
 
@@ -2194,7 +2194,7 @@ body { padding-bottom: 70px; }
         <strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
       </div>
       <div class="alert alert-warning">
-        <strong>Warning!</strong> Best check yo self, you're <a href="#" class="alert-link">not looking too good</a>.
+        <strong>Warning!</strong> Better check yourself, you're <a href="#" class="alert-link">not looking too good</a>.
       </div>
       <div class="alert alert-danger">
         <strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.