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/templates/pages/javascript.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b62bbfc3c..29cce61e6 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -496,7 +496,7 @@ $('#myModal').on('hidden', function () {
           <h2>{{_i}}Usage{{/i}}</h2>
 
           <h3>{{_i}}Via data attributes{{/i}}</h3>
-          <p>{{_i}}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.{{/i}}</p>
+          <p>{{_i}}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.{{/i}}</p>
           <pre class="prettyprint linenums">&lt;body data-spy="scroll" data-target=".navbar"&gt;...&lt;/body&gt;</pre>
 
           <h3>{{_i}}Via JavaScript{{/i}}</h3>
-- 
cgit v1.2.3


From 44e35e9dfa33fe618218c770f0495bd9596f3485 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 18 Aug 2012 19:33:46 -0700
Subject: fix component

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 29cce61e6..b419fb314 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -496,7 +496,7 @@ $('#myModal').on('hidden', function () {
           <h2>{{_i}}Usage{{/i}}</h2>
 
           <h3>{{_i}}Via data attributes{{/i}}</h3>
-          <p>{{_i}}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.{{/i}}</p>
+          <p>{{_i}}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.{{/i}}</p>
           <pre class="prettyprint linenums">&lt;body data-spy="scroll" data-target=".navbar"&gt;...&lt;/body&gt;</pre>
 
           <h3>{{_i}}Via JavaScript{{/i}}</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/templates/pages/javascript.mustache | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b419fb314..c91ed3eb0 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -759,7 +759,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}trigger{{/i}}</td>
                <td>{{_i}}string{{/i}}</td>
                <td>'hover'</td>
-               <td>{{_i}}how tooltip is triggered{{/i}} - hover | focus | manual</td>
+               <td>{{_i}}how tooltip is triggered{{/i}} - click | hover | focus | manual</td>
              </tr>
              <tr>
                <td>{{_i}}delay{{/i}}</td>
@@ -852,7 +852,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?">{{_i}}Hover for popover{{/i}}</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?">{{_i}}Click to toggle popover{{/i}}</a>
         </div>
 
 
@@ -902,8 +902,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
            <tr>
              <td>{{_i}}trigger{{/i}}</td>
              <td>{{_i}}string{{/i}}</td>
-             <td>'hover'</td>
-             <td>{{_i}}how popover is triggered{{/i}} - hover | focus | manual</td>
+             <td>'click'</td>
+             <td>{{_i}}how popover is triggered{{/i}} - click | hover | focus | manual</td>
            </tr>
            <tr>
              <td>{{_i}}title{{/i}}</td>
-- 
cgit v1.2.3