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: [PATCH] #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(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c4ddd0f26e68b072d46816b8b7477f9daffd7523..deab7e441bfdd09e705c61d48147446c3388269d 100644
GIT binary patch
delta 460
zcmeyloB8K%X6^uQW)?065STTQTZv6YSIb{bck;m-!kjSi*%STM*i_--6Z<$AXHA@L
z3|6YDyYWJd0psk+x`yUpHLALsvkZOgfGYfD`7?9V^+Q8A8JH2Kf^|>+pYH<IzS*;&
zQh;&R<iibiFcJ2~Y5|~$%@bA8Y@I#%)I>w5*k;B_uN8o*-fl8wQv<pUXs^cR-6BAd
zC&%sBA+FWh{5I_{2fGN+ZyXG>Cx5=+1k-GNF_;}_Y5xraCKZrpWr6zc-!NfP1#!eD
z$K7HB${OEvgvde!W>21S(-onDYx19)7l5kn-;kaB>XtaN%2|^YZwH|YOup@du<8G8
oV}v<uK&yl9*rN(;yyMISjs=+2B6odIRW#fUfCvaretK5~0C`cTmjD0&

delta 460
zcmeyloB8K%X6^uQW)?065OAExt;ANTqvc<vGx^{RVNQg&zZzQ=Tzq052czS}>Bdl{
z8!yBdFgi}wH8h6`Y|b+Du>-2`m*vmQP1g?%;bdS&m<rZC`G39(Saqe&X3v630igcF
z4R$aQ_Qq<ENb^KhbXzB%nrH|W+sruWwE|Gp+fAl05sl5eMSvntj@z+AT&uPDZQ5ZD
zb`hZ8I2ar!f4<-ZQ)+!Nm>sCJ|AqlmCCIa~K+gReCQM+Ti%*Wb#Re2GzUc^&g$Yc#
z>535Gn*8VH1+X^R$**pSBP2jt6>kTj3QWH30}%k(^#8Uos!c(6>`?_a-f>115V`Av
QD$sB@03skf`RQE|0J({(^Z)<=

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>