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: #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(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2c140266b..0a56f52fd 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 23a53da0e..45ab0703b 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 39da8e1f7..47cac06dc 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>
-- 
cgit v1.2.3