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

1 files changed, 9 insertions, 0 deletions

diff --git a/docs/upgrading.html b/docs/upgrading.html
index c0778d9d0..d7ad30f56 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -186,6 +186,15 @@
     <li>Pills were restyled to be less rounded by default</li>
     <li>Pills now have dropdown menu support (they share the same markup and styles as tabs)</li>
   </ul>
+  <h3>Navbar (formerly topbar)</h3>
+  <ul>
+    <li>Base class changed from <code>.topbar</code> to <code>.navbar</code></li>
+    <li>Now supports static position (default behavior, not fixed) and fixed to the top of viewport via <code>.navbar-fixed-top</code> (previously only supported fixed)</li>
+    <li>Added vertical dividers to top-level nav</li>
+    <li>Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.</li>
+    <li>Navbar search form now requires use of the <code>.navbar-search</code> class and its input the use of <code>.search-query</code>. To position the search form, you <strong>must</strong> use <code>.pull-left</code> or <code>.pull-right</code>.</li>
+    <li>Added optional responsive markup for collapsing navbar contents for smaller resolutions and devices. <a href="./components.html#navbar">See navbar docs</a> for how to utilize.</li>
+  </ul>
   <h3>Dropdown menus</h3>
   <ul>
     <li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>