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

Conflicts:
	docs/index.html

diff --cc docs/index.html
index f914b31b2411acaa70267fd175506e9cc1451c66,5fe22294589da450e25427ea03866aa338907bd1..6f8ad30a2de14754e16cedc803cdcadc06897c36
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -1543,6 -1544,6 +1544,10 @@@ Lorem ipsum dolar sit amet illo error <
               <td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td>
               <td>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</td>
             </tr>
++           <tr>
++             <td><a href="./javascript.html#scrollspy">bootstrap-scrollspy.js</a></td>
++             <td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar.</td>
++           </tr>
             <tr>
               <td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>
               <td>This plugin adds quick, dynamic tab and pill functionality for cycling through local content.</td>
@@@ -1709,19 -1724,19 +1728,19 @@@
  
  </section>
  
+ 
+ 
      </div><!-- /container -->
  
-     <div id="footer">
-       <div class="inner">
-         <div class="container">
-           <p class="right"><a href="#">Back to top</a></p>
-           <p>
-             Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br />
-             Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
-           </p>
-         </div>
+     <footer class="footer">
+       <div class="container">
+         <p class="pull-right"><a href="#">Back to top</a></p>
+         <p>
+           Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br />
+           Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
+         </p>
        </div>
-     </div>
+     </footer>
  
    </body>
 -</html>
 +</html>

diff --cc docs/javascript.html
index 294f5dbe4bd033a2cab4d5a2f91f1dd5154e4a86,10acbbf5b628bdf12a822702a7802df7981661d0..b830e7d64f172e4e7ad040d98b1fb7e96e986115
--- 1/docs/javascript.html
--- 2/docs/javascript.html
+++ b/docs/javascript.html
@@@ -44,9 -44,9 +44,10 @@@
          <div class="container">
            <h3><a href="#">Bootstrap JS</a></h3>
            <ul>
+             <li><a href="#overview">Overview</a></li>
              <li><a href="#modal">Modals</a></li>
              <li><a href="#dropdown">Dropdown</a></li>
 +            <li><a href="#scrollspy">ScrollSpy</a></li>
              <li><a href="#tabs">Tabs</a></li>
              <li><a href="#twipsy">Twipsy</a></li>
              <li><a href="#popover">Popover</a></li>