Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

7 files changed, 11 insertions, 19 deletions

diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index fa7958ef8..3d664e624 100644
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -5,7 +5,6 @@
 
   <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
   <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-  <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
   <ul class="footer-links">
     <li><a href="http://blog.getbootstrap.com">Blog</a></li>
     <li class="muted">&middot;</li>
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 19a9af636..fcfc7c482 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -4,10 +4,6 @@
 <script src="/assets/js/jquery.js"></script>
 <script src="/assets/js/bootstrap.js"></script>
 
-<!-- Offcanvas example
-================================================== -->
-<script src="/assets/js/examples/bootstrap-offcanvas.js"></script>
-
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
 <script src="/assets/js/holder/holder.js"></script>
 
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html
index 4f49d68b2..ed00b62fa 100644
--- a/docs/_includes/nav-components.html
+++ b/docs/_includes/nav-components.html
@@ -1,18 +1,9 @@
 <li>
-  <a href="#icons">Glyphicons</a>
-  <ul class="nav">
-    <li><a href="#icons-list">Icon list</a></li>
-    <li><a href="#icons-how-to">How to use</a></li>
-    <li><a href="#icons-examples">Examples</a></li>
-  </ul>
-</li>
-<li>
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">
     <li><a href="#dropdowns-example">Example</a></li>
     <li><a href="#dropdowns-alignment">Alignment options</a></li>
     <li><a href="#dropdowns-disabled">Disabled menu items</a></li>
-    <li><a href="#dropdowns-submenus">Submenus</a></li>
   </ul>
 </li>
 <li>
@@ -102,9 +93,7 @@
   <a href="#list-group">List group</a>
   <ul class="nav">
     <li><a href="#list-group-basic">Basic list group</a></li>
-    <li><a href="#list-group-chevrons">Chevrons</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
-    <li><a href="#list-group-badges-chevrons">Badges and chevrons</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
     <!-- <li><a href="#list-group-pic">Leading picture</a></li> -->
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index 534c9c2ed..fb00465c2 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -10,6 +10,9 @@
   </ul>
 </li>
 <li>
+  <a href="#glyphicons">Glyphicons</a>
+</li>
+<li>
   <a href="#grid">Grid system</a>
   <ul class="nav">
     <li><a href="#grid-options">Available options</a></li>
@@ -19,7 +22,6 @@
     <li><a href="#grid-offsetting">Offset columns</a></li>
     <li><a href="#grid-nesting">Nested columns</a></li>
     <li><a href="#grid-column-ordering">Column ordering</a></li>
-    <li><a href="#grid-small">Small device grid</a></li>
     <li><a href="#grid-less">LESS mixins and variables</a></li>
   </ul>
 </li>
diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html
index 38c96d543..1539b0c25 100644
--- a/docs/_includes/nav-customize.html
+++ b/docs/_includes/nav-customize.html
@@ -5,7 +5,7 @@
   <a href="#plugins">jQuery plugins</a>
 </li>
 <li>
-  <a href="#variables">LESS variables</a>
+  <a href="#less-variables">LESS variables</a>
   <ul class="nav">
     <li><a href="#variables-basics">Basics</a></li>
     <li><a href="#variables-buttons">Buttons</a></li>
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html
index 305de607b..022d335cd 100644
--- a/docs/_includes/nav-getting-started.html
+++ b/docs/_includes/nav-getting-started.html
@@ -12,5 +12,11 @@
   <a href="#template">Basic template</a>
 </li>
 <li>
+  <a href="#browsers">Browser support</a>
+</li>
+<li>
+  <a href="#license-faqs">License FAQs</a>
+</li>
+<li>
   <a href="#customizing">Customizing Bootstrap</a>
 </li>
\ No newline at end of file
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html
index 9422b27fb..13079580b 100644
--- a/docs/_includes/nav-javascript.html
+++ b/docs/_includes/nav-javascript.html
@@ -2,7 +2,7 @@
   <a href="#js-overview">Overview</a>
   <ul class="nav">
     <li><a href="#js-individual-compiled">Individual or compiled</a></li>
-    <li><a href="#js-data-attributes">Data attributes</a></li>
+    <li><a href="#js-data-attrs">Data attributes</a></li>
     <li><a href="#js-programmatic-api">Programmatic API</a></li>
     <li><a href="#js-noconflict">No Conflict</a></li>
     <li><a href="#js-events">Events</a></li>