From fad0fb683bdcc71f5ffc9c18300dd19427b588ae Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Sat, 22 Dec 2012 13:24:37 -0800
Subject: allow multiple trigger types in tooltip and popover + default tooltip
 to hover & focus

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index ac617a6b8..43e495f93 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -836,8 +836,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              <tr>
                <td>trigger</td>
                <td>string</td>
-               <td>'hover'</td>
-               <td>how tooltip is triggered - click | hover | focus | manual</td>
+               <td>'hover focus'</td>
+               <td>how tooltip is triggered - click | hover | focus | manual. Note, you case pass trigger mutliple, space seperated, trigger types.</td>
              </tr>
              <tr>
                <td>delay</td>
-- 
cgit v1.2.3