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/upgrading.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/upgrading.html')

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


From 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 1 Feb 2012 22:51:01 -0800
Subject: fixing some docs pages for i18n

---
 docs/upgrading.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index f3b18e4ed..4d8328b7c 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -195,7 +195,6 @@
   <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


From 25ffe14c1bf43539d12b459a3807d37d826d1246 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 1 Feb 2012 23:02:31 -0800
Subject: add line item to docs on upgrading per #1488

---
 docs/upgrading.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 4d8328b7c..7398952ba 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -204,6 +204,7 @@
   <ul>
     <li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>
     <li>Now requires you to add a <code>&lt;span class="caret"&gt;&lt;/span&gt;</code> to show the dropdown arrow</li>
+    <li>Now requires you to add a <code>data-toggle="dropdown"</code> attribute to obtain toggling behavior</li>
     <li>The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.</li>
   </ul>
   <h3>Labels</h3>
-- 
cgit v1.2.3


From 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001
From: Kyle Robinson Young <kyle@dontkry.com>
Date: Wed, 1 Feb 2012 23:30:37 -0800
Subject: Typo fixes

---
 docs/upgrading.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 098bcbdc9..9ee5e3fbe 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -220,7 +220,7 @@
   <ul>
     <li>New base class: <code>.alert</code> instead of <code>.alert-message</code></li>
     <li>Class names standardized for other options, now all starting with <code>.alert-</code></li>
-    <li>Redesigned base alert styles to combine the deafult alerts and block-level alerts into one</li>
+    <li>Redesigned base alert styles to combine the default alerts and block-level alerts into one</li>
     <li>Block level alert class changed: <code>.alert-block</code> instead of <code>.block-message</code></li>
   </ul>
   <h3>Progress bars</h3>
-- 
cgit v1.2.3


From 679cd5ea02ca83d9c3755d6ac74f4a0bacd02897 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 4 Feb 2012 22:38:49 -0800
Subject: #1706: protocol independent html5shim added, and moved after the CSS
 for loading time's sake

---
 docs/upgrading.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 456afe6a5..ad3236f2b 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
     <!-- Le styles -->
     <link href="assets/css/bootstrap.css" rel="stylesheet">
     <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="assets/ico/favicon.ico">
     <link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
-- 
cgit v1.2.3


From 31abeec0f2d84b3861d0c80c56c3112546bf0bfd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 00:05:01 -0800
Subject: manually handle #1703 for note on horizontal forms

---
 docs/upgrading.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index ad3236f2b..5a7b0d2f6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -158,6 +158,7 @@
     <li>Default form style is now vertical (stacked) to use less CSS and add greater flexibility</li>
     <li>Form classes standardized with <code>.form-</code> required as a prefix</li>
     <li>New built-in form defaults for search, inline, and horizontal forms</li>
+    <li>For horizontal forms, previous classes <code>.clearfix</code> and <code>.input</code> are equivalent to the new <code>.control-group</code> and <code>.controls</code>.</li>
     <li>More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code></li>
     <li>Form states: colors updated and customizable via new LESS variables</li>
   </ul>
-- 
cgit v1.2.3


From dfcb2d1ed83e2c1bc76b4646ba28dccae4205d08 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 00:25:40 -0800
Subject: #1697: update upgrading docs to include mention of no more secondary
 class in modals

---
 docs/upgrading.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5a7b0d2f6..39da8e1f7 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -152,6 +152,7 @@
     <li>IE9: removed gradients and added rounded corners</li>
     <li>Updated active state to make styling clearer in button groups (new) and look better with custom transition</li>
     <li>New mixin, <code>.buttonBackground</code>, to set button gradients</li>
+    <li>The <code>.secondary</code> class was removed from modal examples in our docs as it never had associated styles.</li>
   </ul>
   <h3>Forms</h3>
   <ul>
-- 
cgit v1.2.3


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/upgrading.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/upgrading.html')

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


From d7aefe67e3df78bde61eaa7ecab807bb03aeb1ef Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 10 Feb 2012 23:07:32 -0800
Subject: scope th bottom vertical-align to only thead, update code styles to
 include more comments in less file and scrollable option for pre tag

---
 docs/upgrading.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 47cac06dc..5ab8a39ba 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -248,6 +248,13 @@
   <div class="alert alert-info">
     <strong>Heads up!</strong> We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.
   </div>
+  <h3>Tooltips</h3>
+  <ul>
+    <li>The plugin method has been renamed from <code>twipsy()</code> to <code>tooltip()</code>, and the class name changed from <code>twipsy</code> to <code>tooltip</code>.</li>
+    <li>The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.</li>
+    <li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
+    <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
+  </ul>
   <h3>Popovers</h3>
   <ul>
     <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
-- 
cgit v1.2.3


From c16ccf64f1f51bca4e4564d23211274e3d995e16 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 17:25:30 -0800
Subject: update tooltips message in upgrade docs

---
 docs/upgrading.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5ab8a39ba..5416b9987 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -246,7 +246,7 @@
     <h1>Javascript plugins</h1>
   </div>
   <div class="alert alert-info">
-    <strong>Heads up!</strong> We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.
+    <strong>Heads up!</strong> We've rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.
   </div>
   <h3>Tooltips</h3>
   <ul>
@@ -255,6 +255,10 @@
     <li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
     <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
   </ul>
+  <h3>Tooltips</h3>
+  <ul>
+    <li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li>
+  </ul>
   <h3>Popovers</h3>
   <ul>
     <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
-- 
cgit v1.2.3


From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 11:08:33 -0800
Subject: re-add protocol to the shim

---
 docs/upgrading.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5416b9987..5503d3afb 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
     <!-- Le styles -->
     <link href="assets/css/bootstrap.css" rel="stylesheet">
     <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="assets/ico/favicon.ico">
     <link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
-- 
cgit v1.2.3


From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 11:08:58 -0800
Subject: move shim after css

---
 docs/upgrading.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 5503d3afb..0c9ab1673 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -7,17 +7,17 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
     <!-- Le styles -->
     <link href="assets/css/bootstrap.css" rel="stylesheet">
     <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="assets/ico/favicon.ico">
     <link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
-- 
cgit v1.2.3


From 0369c1fcfc22530171fdf6a1d6400767dc13f609 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 16 Feb 2012 21:04:16 -0800
Subject: add mention of navbar vertical divider in docs

---
 docs/upgrading.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'docs/upgrading.html')

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 0c9ab1673..f56f22545 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -115,7 +115,7 @@
   <ul>
     <li>Media queries added for <strong>basic support</strong> across mobile and tablet devices
     <li>Responsive CSS is compiled separately, as bootstrap-responsive.css</li>
-  </ul>  
+  </ul>
 </section>
 
 
@@ -255,13 +255,10 @@
     <li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
     <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
   </ul>
-  <h3>Tooltips</h3>
-  <ul>
-    <li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li>
-  </ul>
   <h3>Popovers</h3>
   <ul>
     <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
+    <li>The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.</li>
   </ul>
   <h3>New plugins</h3>
   <ul>
-- 
cgit v1.2.3