aboutsummaryrefslogtreecommitdiff
path: root/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-18 19:53:53 -0700
committerMark Otto <[email protected]>2013-07-18 19:53:53 -0700
commit49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b (patch)
tree56309b7c3580af6a00bf57f6279ace2c325d8f72 /javascript.html
parente440ff4b3f872af175873283899cb40f50b8010f (diff)
parente160b14223e2778af23c5ca90329b735da5b2ea7 (diff)
downloadbootstrap-49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b.tar.xz
bootstrap-49f2f7fad9a0364a2d971b4c9f8e2969b29cc15b.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
-rw-r--r--javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html
index 94946a351..b4e053056 100644
--- a/javascript.html
+++ b/javascript.html
@@ -815,7 +815,7 @@ $('#example').tooltip(options)
<td>trigger</td>
<td>string</td>
<td>'hover focus'</td>
- <td>how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types.</td>
+ <td>how tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
</tr>
<tr>
<td>delay</td>