From 75d6c14dc982300728a4c7016a9d7d856869bc3c Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 2 May 2015 18:20:59 -0700
Subject: [PATCH] Document that 'manual' is mutually exclusive of other
tooltip/popover triggers
Closes #16122
[skip sauce]
---
docs/_includes/js/popovers.html | 2 +-
docs/_includes/js/tooltips.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index a782a12047..9e2532733f 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -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>
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 5b399a5f38..991c0c9c94 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -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>
--
GitLab