From 937cfa6a88919eaa6bfd3e65405093f9bd46c95d Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 18 Aug 2012 19:32:50 -0700
Subject: add note about .nav

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index bc5d606cd..31ad87edd 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -566,7 +566,7 @@ $('#myModal').on('hidden', function () {
           <h2>Usage</h2>
 
           <h3>Via data attributes</h3>
-          <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use.</p>
+          <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll want to scrollspy with the <code>.nav</code> class.</p>
           <pre class="prettyprint linenums">&lt;body data-spy="scroll" data-target=".navbar"&gt;...&lt;/body&gt;</pre>
 
           <h3>Via JavaScript</h3>
-- 
cgit v1.2.3


From 45dddc59a19f3e9decaa4bf0e0db3f884a0f6ff7 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 18 Aug 2012 19:54:30 -0700
Subject: add click option for tooltip, popover - make click default for
 popover

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 31ad87edd..3a207dd48 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -566,7 +566,7 @@ $('#myModal').on('hidden', function () {
           <h2>Usage</h2>
 
           <h3>Via data attributes</h3>
-          <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll want to scrollspy with the <code>.nav</code> class.</p>
+          <p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll want to use scrollspy with a <code>.nav</code> component.</p>
           <pre class="prettyprint linenums">&lt;body data-spy="scroll" data-target=".navbar"&gt;...&lt;/body&gt;</pre>
 
           <h3>Via JavaScript</h3>
@@ -829,7 +829,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>trigger</td>
                <td>string</td>
                <td>'hover'</td>
-               <td>how tooltip is triggered - hover | focus | manual</td>
+               <td>how tooltip is triggered - click | hover | focus | manual</td>
              </tr>
              <tr>
                <td>delay</td>
@@ -922,7 +922,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
 
         <h3>Live demo</h3>
         <div class="bs-docs-example" style="padding-bottom: 24px;">
-          <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Hover for popover</a>
+          <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
         </div>
 
 
@@ -972,8 +972,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
            <tr>
              <td>trigger</td>
              <td>string</td>
-             <td>'hover'</td>
-             <td>how popover is triggered - hover | focus | manual</td>
+             <td>'click'</td>
+             <td>how popover is triggered - click | hover | focus | manual</td>
            </tr>
            <tr>
              <td>title</td>
-- 
cgit v1.2.3