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

2 files changed, 1 insertions, 20 deletions

diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
deleted file mode 100644
index 3d664e624..000000000
--- a/docs/_includes/colophon.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Footer
-================================================== -->
-<footer class="bs-footer">
-  {% include social-buttons.html %}
-
-  <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>
-  <ul class="footer-links">
-    <li><a href="http://blog.getbootstrap.com">Blog</a></li>
-    <li class="muted">&middot;</li>
-    <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
-    <li class="muted">&middot;</li>
-    <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
-  </ul>
-</footer>
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html
index bde8bf404..08a4afc0e 100644
--- a/docs/_includes/nav-getting-started.html
+++ b/docs/_includes/nav-getting-started.html
@@ -12,11 +12,7 @@
   <a href="#browsers">Browser support</a>
 </li>
 <li>
-  <a href="#examples">Templates and examples</a>
-  <ul class="nav">
-    <li><a href="#examples-template">HTML template</a></li>
-    <li><a href="#examples-list">List of examples</a></li>
-  </ul>
+  <a href="#template">Basic template</a>
 </li>
 <li>
   <a href="#license-faqs">License FAQs</a>