Merge branch 'master' into docs_derp

Conflicts:
	docs/components.html

5 files changed, 6 insertions, 5 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 9a2a5754e..2c9e4f985 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -60,6 +60,9 @@ module.exports = function (grunt) {
       },
       test: {
         src: ['js/tests/unit/*.js']
+      },
+      assets: {
+        src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
       }
     },
 
diff --git a/docs/components.html b/docs/components.html
index 503b612f6..b81b74937 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -14,8 +14,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
     </div>
 
     <h2 id="glyphicons-glyphs">Available glyphs</h2>
-    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
-
+    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
     <div class="bs-glyphicons">
       <ul class="bs-glyphicons-list">
         {% for iconClassName in site.data.glyphicons %}
diff --git a/docs/css.html b/docs/css.html
index 424145776..b4132de92 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -2414,7 +2414,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <p class="bg-danger">Donec ullamcorper nulla non metus auctor fringilla.</p>
     </div>
 {% highlight html %}
-<p class="bg-muted">...</p>
 <p class="bg-primary">...</p>
 <p class="bg-success">...</p>
 <p class="bg-info">...</p>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index cf3ee6119..c947892f5 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -101,8 +101,8 @@ bootstrap/
 └── docs/
     └── examples/
 {% endhighlight %}
+    <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p>
   </div>
-  <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p>
 
 
   <!-- Template
diff --git a/js/tooltip.js b/js/tooltip.js
index c472406ff..ce9ee4c5a 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -211,7 +211,7 @@
 
     // $.fn.offset doesn't round pixel values
     // so we use setOffset directly with our own function B-0
-    jQuery.offset.setOffset($tip[0], $.extend({
+    $.offset.setOffset($tip[0], $.extend({
       using: function (props) {
         $tip.css({
           top: Math.round(props.top),