Merge pull request #16411 from twbs/doc-16122

Doc that 'manual' is mutex of other tooltip/popover triggers
twbs · May 3, 2015 · 7b9f204 · 7b9f204
2 parents 0689117 + 75d6c14
commit 7b9f204
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
@@ -229,7 +229,7 @@ <h3 id="popovers-options">Options</h3>
           <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>

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
@@ -195,7 +195,7 @@ <h3 id="tooltips-options">Options</h3>
           <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>