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

Conflicts:
	docs/assets/bootstrap.zip

12 files changed, 39 insertions, 0 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a75e75ca8..7efe21437 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/base-css.html b/docs/base-css.html
index fe6e4fe89..0eb35b641 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1576,5 +1576,7 @@ For example, <code>section</code> should be wrapped as inline.
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/build/index.js b/docs/build/index.js
index 4c759c6e0..5321fa750 100644
--- a/docs/build/index.js
+++ b/docs/build/index.js
@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 var hogan = require('hogan.js')
   , fs    = require('fs')
+  , prod  = process.argv[2] == 'production'
 
 var layout, pages
 
@@ -21,6 +22,7 @@ pages.forEach(function (name) {
 
   context[name.replace(/\.mustache$/, '')] = 'active'
   context._i = true
+  context.production = prod
 
   page = hogan.compile(page, { sectionTags: [{o:'_i', c:'i'}] })
   page = layout.render(context, {
diff --git a/docs/components.html b/docs/components.html
index 0ccbf512e..0951c23b8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1511,5 +1511,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/download.html b/docs/download.html
index a3dc42f6a..f975ac3b2 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -354,5 +354,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/examples.html b/docs/examples.html
index d317405ae..ff165685f 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -139,5 +139,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index ea370e1cd..dcf39a792 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -243,5 +243,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/javascript.html b/docs/javascript.html
index 4287f852d..d74fc5234 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1459,5 +1459,7 @@ $('.myCarousel').carousel({
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/less.html b/docs/less.html
index 4249822d7..9a4df78c2 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -790,5 +790,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 7f9c9de66..b8a635cdd 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -432,5 +432,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 28a11d3fd..5f49bb62a 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -109,5 +109,24 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+    {{#production}}
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
+    {{/production}}
+
   </body>
 </html>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 3bf02e178..4d8328b7c 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -291,5 +291,7 @@
     <script src="assets/js/bootstrap-carousel.js"></script>
     <script src="assets/js/bootstrap-typeahead.js"></script>
     <script src="assets/js/application.js"></script>
+
+
   </body>
 </html>