From 6661639b37a6e577c4795e4394a0f0b6b75f4a01 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 00:29:19 -0800
Subject: [PATCH] #1693: manual fix of the pull request to add class name
 changes to pills/tabs to upgrade guide

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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2c140266b250004008a34143567f4d4acf72f5c9..0a56f52fd9515d121cdca978a51ccb04a2eed190 100644
GIT binary patch
delta 402
zc-mV&lX>|}X6^uQW)?065LhsgTS@7(t)Bl`ATF)oW?*Fb&d9*PA_9~{R^_k8dIqFw
zGH-zl<ARCP?ZDhK8*iQFU|cYH8K)D3zxgd^5Ia!7LC~1>G+3ZQFxLPm@XXO1szS+W
zzb?=Of7!|Z^EttapoUJ?DsTbwPj4<Rs1g7Qylb$73K%xlfCSb}R7G~i<gXJAA^gqS
zlinyWE}Sf}*_0LJlQWYI8-+KgZeA?{R3&)AfbsO?f2SlS2b^L9@)J*(FrESO<$&z1
zCw$;+#ghSW_QaEpU_BuAr<1N=afE)^$t9=6;qt3b1;N>}r+rZD>O5@>H}lSEdnkM1
PWa~4|jAtj;pV0sSd?2F<

delta 402
zc-mV&lX>|}X6^uQW)?065D1^ht)%2?tLN_y#HAJ742&$_85tN@M1XS0s{GYh-9V})
z^A^Z3hEJSs2j;qMymgv`F?{kePA3R|^IOg!cA$WRpfOaSLNM0=DDceD94esXv|kr!
zg1_wK|M{G(t_VXXYZbVF`L3Ib3#tTw0`D5^paO=CH6Vd?6IGF&G5PC6LkNGf_M|ro
zj1iM1Hk-17eBw6Quu*t(>gLrVKvjY#3>aM}|2riyIp7o<ke_(MgwYMimjkl5p74RQ
z6;B4h*%MDX!r7lrx`NpV{j!rwPKkrf1j(;H6$EF?p7ueptMjxm+?+e7?V;?5$<}9_
L8Qmw>pV0sStBQ$R

diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 23a53da0e9..45ab0703bd 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -111,7 +111,7 @@
   </ul>
   <h3>{{_i}}Navigation{{/i}}</h3>
   <ul>
-    <li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code>{{/i}}</li>
+    <li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code> and the class names are now <code>.nav-pills</code> and <code>.nav-tabs</code>.{{/i}}</li>
     <li>{{_i}}New nav list variation added that uses the same base class, <code>.nav</code>{{/i}}</li>
     <li>{{_i}}Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code>{{/i}}</li>
     <li>{{_i}}Pills were restyled to be less rounded by default{{/i}}</li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 39da8e1f7e..47cac06dcc 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -187,7 +187,7 @@
   </ul>
   <h3>Navigation</h3>
   <ul>
-    <li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code></li>
+    <li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code> and the class names are now <code>.nav-pills</code> and <code>.nav-tabs</code>.</li>
     <li>New nav list variation added that uses the same base class, <code>.nav</code></li>
     <li>Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code></li>
     <li>Pills were restyled to be less rounded by default</li>
-- 
2.47.3