From: Mark Otto <markdotto@gmail.com>
Date: Thu, 2 Feb 2012 06:29:15 +0000 (-0800)
Subject: #1566: add note about removal of secondary-nav in 2.0
X-Git-Tag: v2.0.1~1^2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43d797dfff839013deb726a55edf082378444640;p=thirdparty%2Fbootstrap.git

#1566: add note about removal of secondary-nav in 2.0
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c4ddd0f26e..deab7e441b 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 02d1c7febd..30b843e0d7 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -119,6 +119,7 @@
   <ul>
     <li>{{_i}}Base class changed from <code>.topbar</code> to <code>.navbar</code>{{/i}}</li>
     <li>{{_i}}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){{/i}}</li>
+    <li>{{_i}}Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav{{/i}}</li>
     <li>{{_i}}Added vertical dividers to top-level nav{{/i}}</li>
     <li>{{_i}}Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.{{/i}}</li>
     <li>{{_i}}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>.{{/i}}</li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 4d8328b7c2..f3b18e4edf 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -195,6 +195,7 @@
   <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>Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav</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>