From 43d797dfff839013deb726a55edf082378444640 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 1 Feb 2012 22:29:15 -0800
Subject: #1566: add note about removal of secondary-nav in 2.0

---
 docs/assets/bootstrap.zip               | Bin 56825 -> 56825 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c4ddd0f26..deab7e441 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 02d1c7feb..30b843e0d 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 4d8328b7c..f3b18e4ed 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>
-- 
cgit v1.2.3