Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html

1 files changed, 28 insertions, 0 deletions

diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html
new file mode 100644
index 000000000..9422b27fb
--- /dev/null
+++ b/docs/_includes/nav-javascript.html
@@ -0,0 +1,28 @@
+<li>
+  <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-programmatic-api">Programmatic API</a></li>
+    <li><a href="#js-noconflict">No Conflict</a></li>
+    <li><a href="#js-events">Events</a></li>
+  </ul>
+</li>
+<li><a href="#transitions">Transitions</a></li>
+<li>
+  <a href="#modals">Modal</a>
+  <ul class="nav">
+    <li><a href="#modals-examples">Examples</a></li>
+    <li><a href="#modals-usage">Usage</a></li>
+  </ul>
+</li>
+<li><a href="#dropdowns">Dropdown</a></li>
+<li><a href="#scrollspy">Scrollspy</a></li>
+<li><a href="#tabs">Tab</a></li>
+<li><a href="#tooltips">Tooltip</a></li>
+<li><a href="#popovers">Popover</a></li>
+<li><a href="#js-alerts">Alert</a></li>
+<li><a href="#js-buttons">Button</a></li>
+<li><a href="#collapse">Collapse</a></li>
+<li><a href="#carousel">Carousel</a></li>
+<li><a href="#affix">Affix</a></li>