Merge branch 'master' into pr/11676

Conflicts:
	less/modals.less

6 files changed, 39 insertions, 10 deletions

diff --git a/_includes/footer.html b/_includes/footer.html
index 56518ac49..095e96eb5 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,19 +2,15 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
+<script src="{{ page.base_url }}dist/js/bootstrap.min.js"></script>
 
 <script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
 <script src="{{ page.base_url }}docs-assets/js/application.js"></script>
 
 {% if page.slug == "customize" %}
-<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
-<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
-<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
-<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
 <script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
-<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/customize.js"></script>
 {% endif %}
 
 {% comment %}
diff --git a/_includes/header.html b/_includes/header.html
index 41ecfc8e4..18d7660b8 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,8 +1,9 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="">
-<meta name="author" content="">
+<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
+<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development">
+<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
 
 <title>
   {% if page.title == "Bootstrap" %}
diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index f7a705b5f..131114883 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -121,6 +121,7 @@
     <li><a href="#list-group-basic">Basic example</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
+    <li><a href="#list-group-contextual-classes">Contextual classes</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
   </ul>
 </li>
diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index 543d004f3..531b067e6 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -16,6 +16,7 @@
     <li><a href="#grid-media-queries">Media queries</a></li>
     <li><a href="#grid-options">Grid options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
+    <li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
     <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
     <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
     <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
@@ -37,7 +38,14 @@
     <li><a href="#type-lists">Lists</a></li>
   </ul>
 </li>
-<li><a href="#code">Code</a></li>
+<li>
+  <a href="#code">Code</a>
+  <ul class="nav">
+    <li><a href="#code-inline">Inline code</a></li>
+    <li><a href="#code-user-input">User input</a></li>
+    <li><a href="#code-block">Blocks of code</a></li>
+  </ul>
+</li>
 <li>
   <a href="#tables">Tables</a>
   <ul class="nav">
@@ -79,6 +87,8 @@
 <li>
   <a href="#helper-classes">Helper classes</a>
   <ul class="nav">
+    <li><a href="#helper-classes-colors">Contextual colors</a></li>
+    <li><a href="#helper-classes-backgrounds">Contextual backgrounds</a></li>
     <li><a href="#helper-classes-close">Close icon</a></li>
     <li><a href="#helper-classes-carets">Carets</a></li>
     <li><a href="#helper-classes-floats">Quick floats</a></li>
@@ -97,3 +107,11 @@
     <li><a href="#responsive-utilities-tests">Test cases</a></li>
   </ul>
 </li>
+<li>
+  <a href="#less">Using LESS</a>
+  <ul class="nav">
+    <li><a href="#less-variables">Variables</a></li>
+    <li><a href="#less-mixins-vendor">Vendor mixins</a></li>
+    <li><a href="#less-mixins-utility">Utility mixins</a></li>
+  </ul>
+</li>
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index ce7a718d6..6c041eef3 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -32,7 +32,19 @@
   </ul>
 </li>
 <li>
-  <a href="#browsers">Browser support</a>
+  <a href="#browsers">Browser and device support</a>
+  <ul class="nav">
+    <li><a href="#support-browsers">Supported browsers</a></li>
+    <li><a href="#support-ie8-ie9">Internet Explorer 8-9</a></li>
+    <li><a href="#support-ie8-respondjs">IE8 and Respond.js</a></li>
+    <li><a href="#support-ie8-box-sizing">IE8 and box-sizing</a></li>
+    <li><a href="#support-ie-compatibility-modes">IE Compatibility modes</a></li>
+    <li><a href="#support-ie10-width">IE10 and Windows (Phone) 8</a></li>
+    <li><a href="#support-safari-percentages">Safari percent rounding</a></li>
+    <li><a href="#support-fixed-position-keyboards">Modals, navbars, and virtual keyboards</a></li>
+    <li><a href="#support-browser-zooming">Browser zooming</a></li>
+    <li><a href="#support-android-stock-browser">Android stock browser</a></li>
+  </ul>
 </li>
 <li>
   <a href="#third-parties">Third party support</a>
diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html
index e97027096..aeeafe264 100644
--- a/_includes/nav-javascript.html
+++ b/_includes/nav-javascript.html
@@ -13,6 +13,7 @@
   <a href="#modals">Modal</a>
   <ul class="nav">
     <li><a href="#modals-examples">Examples</a></li>
+    <li><a href="#modals-sizes">Sizes</a></li>
     <li><a href="#modals-usage">Usage</a></li>
   </ul>
 </li>