Merge branch '3.0.0-wip' into bs3_remove_icons

Conflicts:
	docs/components.html

_config.yml

@@ -9,4 +9,3 @@ permalink:    pretty
 source:       ./docs
 destination:  ./_gh_pages
 port:         9001
-url:          http://getbootstrap.dev:9001

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>
 

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>