From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 21 Mar 2012 10:28:23 +0000 (+0100)
Subject: Add note about styling tabs
X-Git-Tag: v2.0.3~5^2~144^2~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02a67ea59eb8ee28ba4220898c1a0b2052a80915;p=thirdparty%2Fbootstrap.git

Add note about styling tabs
Fix typo in popover docs
---

diff --git a/docs/javascript.html b/docs/javascript.html
index 739e2475f7..c9b94a3ca5 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -644,7 +644,7 @@ $('#myTab a[href="#profile"]').tab('show');
 $('#myTab a:last').tab('show');
 </pre>
           <h3>Markup</h3>
-          <p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element.</p>
+          <p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the bootstrap tab styling.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav nav-tabs"&gt;
   &lt;li&gt;&lt;a href="#home" data-toggle="tab"&gt;Home&lt;/a&gt;&lt;/li&gt;
@@ -898,7 +898,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           </div>
           <h3>Markup</h3>
           <p>
-          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
+          For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.
           </p>
           <h3>Methods</h3>
           <h4>$().popover(options)</h4>