0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Merge pull request #16411 from twbs/doc-16122

Doc that 'manual' is mutex of other tooltip/popover triggers
This commit is contained in:
Chris Rebert 2015-05-02 19:06:59 -07:00
commit 7b9f204cb4
2 changed files with 2 additions and 2 deletions

View File

@ -229,7 +229,7 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
<td>trigger</td>
<td>string</td>
<td>'click'</td>
<td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
<td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td>
</tr>
<tr>
<td>viewport</td>

View File

@ -195,7 +195,7 @@ $('#example').tooltip(options)
<td>trigger</td>
<td>string</td>
<td>'hover focus'</td>
<td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
<td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space. <code>manual</code> cannot be combined with any other trigger.</td>
</tr>
<tr>
<td>viewport</td>