From 6dc59a9c3e0facab3abed7cb66d90c2316530014 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 24 Mar 2012 18:45:12 -0700
Subject: [PATCH] add explict note that tooltip delay isn't applied to manual
 trigger type in popover/tooltip

---
 docs/assets/bootstrap.zip                | Bin 56306 -> 56306 bytes
 docs/javascript.html                     |   4 ++--
 docs/templates/pages/javascript.mustache |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 594fb24db8cf2d9287ba4f0559891cbf0e78c526..9301d50c45b137398563ecac676c459e69c90ecb 100644
GIT binary patch
delta 440
zcmeygo%z#tW}X0VW)?065Lh^MB99{5+=@K^c@>k_&lTl>3kRqogr%8)>Sox21?E<4
zyuF(fC@^^jmm}Lepw77!o9}a(aDaqFg^i$!Hv0-MHw6iO^Du)NwAskB)d*x#fDC_T
zZn}PG2qyzG+-i^=lNoEAVfwvlDg{77M|)uQZszE%1`D;$RRLQJb~0GsnYji~k<Co=
zCMtpSO+8=&6FPsOM+_tsdtIMtZpCEzo8oY9PF{Q67$PPMw*Q7V5-<0LKNHXn`I}(5
zyEhz=<m_&`U@=Q(^8TCRNUFZy3`F8(-h!HrWdGG$Mo4yO+_ppFwcmCE@lM}X2LSW>
Bubuz^

delta 440
zcmeygo%z#tW}X0VW)?065Ga{6kw=kjO;Miz+M>zp=ZbPbgi9w)3{YiT3lo-R0t(Eq
zg$iuEy_*v#FnI=-BUEJbeJ&FYrjkjMMTL!^hHds0UTz9f_07W!tZGfsW+Ts5BcQ5@
z0W$oVx#{|$A)E}%aI2+3`Wb7S!TN!Uy=p22Kte}*Y+*tiz10FBBU|UHpt^1HnYjiq
zr!dW%s030p^?(UX==^~mF_2NQ*Y%m!6it@DDGvAM<h9q0nSfrGzbOmS#CXFSiI;oB
zAI1afzI(#~q8qHz?xqVw4rUfm#oFsKllR{ghp7UJe7_lp#LK+pjbZ=QTShQDfc9(L
QwnO5z-*y7=PTy7s0E+{xcmMzZ

diff --git a/docs/javascript.html b/docs/javascript.html
index 8728eb66df..631b7e2eca 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -797,7 +797,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing and hiding the tooltip (ms)</p>
+                <p>delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>
@@ -906,7 +906,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing and hiding the popover (ms)</p>
+                <p>delay showing and hiding the popover (ms) - does not apply to manual trigger type</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 1c5b96d2e6..e037dd0243 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -721,7 +721,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing and hiding the tooltip (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>
@@ -830,7 +830,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing and hiding the popover (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>