From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 01:18:17 +0000 (-0800)
Subject: Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smabos... 
X-Git-Tag: v2.0.1~1^2~17^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85d8fe884c62af4b9269f7d8f0b3d3c91a1244ee;p=thirdparty%2Fbootstrap.git

Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update
---

85d8fe884c62af4b9269f7d8f0b3d3c91a1244ee
diff --cc docs/templates/pages/upgrading.mustache
index 5a370f1137,bac697e21a..ebe70bcdd5
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@@ -170,19 -170,8 +170,19 @@@
      <h1>{{_i}}Javascript plugins{{/i}}</h1>
    </div>
    <div class="alert alert-info">
-     <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}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.{{/i}}
+     <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}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.{{/i}}
    </div>
 +  <h3>{{_i}}Tooltips{{/i}}</h3>
 +  <ul>
 +    <li>{{_i}}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>.{{/i}}</li>
 +    <li>{{_i}}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>.{{/i}}</li>
 +    <li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
 +    <li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
 +  </ul>
 +  <h3>{{_i}}Tooltips{{/i}}</h3>
 +  <ul>
 +    <li>{{_i}}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.){{/i}}</li>
 +  </ul>
    <h3>{{_i}}Popovers{{/i}}</h3>
    <ul>
      <li>{{_i}}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>.{{/i}}</li>