From: Chris Rebert <code@rebertia.com>
Date: Sun, 3 May 2015 01:20:59 +0000 (-0700)
Subject: Document that 'manual' is mutually exclusive of other tooltip/popover triggers
X-Git-Tag: v3.3.5~60^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75d6c14dc982300728a4c7016a9d7d856869bc3c;p=thirdparty%2Fbootstrap.git

Document that 'manual' is mutually exclusive of other tooltip/popover triggers

Closes #16122
[skip sauce]
---

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>