From 6e7bf66de9dd22772a60e774bd5cf62ee36d161a Mon Sep 17 00:00:00 2001
From: dumb <github@dumb.ca>
Date: Mon, 16 May 2016 16:18:51 -0400
Subject: Fix issue #16941 - HTML example in tooltip docs

Added an example tooltip that uses HTML content, and expanded the
description of the html option to clarify usage.
---
 docs/components/tooltips.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index fb8cb24dd..7aad7a787 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -85,6 +85,7 @@ Hover over the buttons below to see their tooltips.
     <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button>
     <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button>
     <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button>
+    <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>">Tooltip with HTML</button>
   </div>
 </div>
 
@@ -101,6 +102,9 @@ Hover over the buttons below to see their tooltips.
 <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="left" title="Tooltip on left">
   Tooltip on left
 </button>
+<button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>">
+  Tooltip with HTML
+</button>
 {% endhighlight %}
 
 ## Usage
@@ -179,7 +183,11 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
         <td>html</td>
         <td>boolean</td>
         <td>false</td>
-        <td>Insert HTML into the tooltip. If false, jQuery's <code>text</code> method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</td>
+        <td>
+          <p>Allow HTML in the tooltip.</p>
+          <p>If true, HTML tags in the tooltip's <code>title</code> will be rendered in the tooltip. If false, jQuery's <code>text</code> method will be used to insert content into the DOM.</p>
+          <p>Use text if you're worried about XSS attacks.</p>
+        </td>
       </tr>
       <tr>
         <td>placement</td>
-- 
cgit v1.2.3


From 6157001bcd39d56524a1135bab66b98f6fe33fb3 Mon Sep 17 00:00:00 2001
From: Patrick Yeo <patrick.yeo@liferay.com>
Date: Thu, 21 Jul 2016 12:44:26 -0700
Subject: Tooltip Static Demo uses v3 class names

---
 docs/components/tooltips.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index fb8cb24dd..a102aa925 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -49,25 +49,25 @@ Hover over the links below to see tooltips:
 Four options are available: top, right, bottom, and left aligned.
 
 <div class="bd-example bd-example-tooltip-static">
-  <div class="tooltip top" role="tooltip">
+  <div class="tooltip tooltip-top" role="tooltip">
     <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the top
     </div>
   </div>
-  <div class="tooltip right" role="tooltip">
+  <div class="tooltip tooltip-right" role="tooltip">
     <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the right
     </div>
   </div>
-  <div class="tooltip bottom" role="tooltip">
+  <div class="tooltip tooltip-bottom" role="tooltip">
     <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the bottom
     </div>
   </div>
-  <div class="tooltip left" role="tooltip">
+  <div class="tooltip tooltip-left" role="tooltip">
     <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the left
@@ -128,7 +128,7 @@ You should only add tooltips to HTML elements that are traditionally keyboard-fo
 <a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a>
 
 <!-- Generated markup by the plugin -->
-<div class="tooltip top" role="tooltip">
+<div class="tooltip tooltip-top" role="tooltip">
   <div class="tooltip-arrow"></div>
   <div class="tooltip-inner">
     Some tooltip text!
-- 
cgit v1.2.3


From 8104bd7a0274149f0c23774e2221363c9ff9f62b Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 11 Sep 2016 22:30:37 -0700
Subject: v4: Update tooltip placement docs (#20696)

* Fixes #19796: Remove mention of tooltip auto placement

* add note to migration docs
---
 docs/components/tooltips.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index a102aa925..e989307ca 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -186,7 +186,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
         <td>string | function</td>
         <td>'top'</td>
         <td>
-          <p>How to position the tooltip - top | bottom | left | right | auto.<br>When "auto" is specified, it will dynamically reorient the tooltip. For example, if placement is "auto left", the tooltip will display to the left when possible, otherwise it will display right.</p>
+          <p>How to position the tooltip - top | bottom | left | right.</p>
           <p>When a function is used to determine the placement, it is called with the tooltip DOM node as its first argument and the triggering element DOM node as its second. The <code>this</code> context is set to the tooltip instance.</p>
         </td>
       </tr>
-- 
cgit v1.2.3


From 7bf868a709d5e278048f7fe5fd62d2fa9365d5bc Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 2 Oct 2016 18:19:47 -0700
Subject: v4: Social meta tags (#20825)

* descriptions for getting started pages

* descriptions for layout

* add content page descriptions

* more descriptions, updates to some existing ones

* correct site url

* add social stuff to config for twitter cards

* add twitter meta tags; use large image for homepage and regular card for all others

* add the assets

* more site config

* more social shiz to partial, remove existing meta for the partial, remove page title from homepage for simpler if statements
---
 docs/components/tooltips.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index e989307ca..10285701f 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -1,6 +1,7 @@
 ---
 layout: docs
 title: Tooltips
+description: Documentation and examples for adding custom Bootstrap tooltips with CSS and JavaScript.
 group: components
 ---
 
-- 
cgit v1.2.3


From 2e69dfa8c1679238579ef6f5ec85deb755e4fb6d Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Tue, 4 Oct 2016 02:55:59 +1000
Subject: Fix broken/redirected links, moving to HTTPS where possible. (#20557)

---
 docs/components/tooltips.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 10285701f..393406af1 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -16,7 +16,7 @@ Inspired by the excellent Tipsy jQuery plugin written by Jason Frame. Tooltips a
 
 Things to know when using the tooltip plugin:
 
-- Tooltips rely on the 3rd party library [Tether](http://github.hubspot.com/tether/) for positioning. You must include [tether.min.js](https://github.com/HubSpot/tether/blob/master/dist/js/tether.min.js) before bootstrap.js in order for tooltips to work!
+- Tooltips rely on the 3rd party library [Tether](http://tether.io/) for positioning. You must include [tether.min.js](https://github.com/HubSpot/tether/blob/master/dist/js/tether.min.js) before bootstrap.js in order for tooltips to work!
 - Tooltips are opt-in for performance reasons, so **you must initialize them yourself**.
 - Tooltips with zero-length titles are never displayed.
 - Specify `container: 'body'` to avoid rendering problems in more complex components (like our input groups, button groups, etc).
@@ -195,7 +195,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
         <td>selector</td>
         <td>string</td>
         <td>false</td>
-        <td>If a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsbin.com/zopod/1/edit">an informative example</a>.</td>
+        <td>If a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="https://jsbin.com/zopod/1/edit">an informative example</a>.</td>
       </tr>
       <tr>
         <td>template</td>
@@ -227,13 +227,13 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
         <td>constraints</td>
         <td>Array</td>
         <td>[]</td>
-        <td>An array of constraints - passed through to Tether. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#constraints">constraint docs</a>.</td>
+        <td>An array of constraints - passed through to Tether. For more information refer to Tether's <a href="http://tether.io/#constraints">constraint docs</a>.</td>
       </tr>
       <tr>
         <td>offset</td>
         <td>string</td>
         <td>'0 0'</td>
-        <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#constraints">offset docs</a>.</td>
+        <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://tether.io/#constraints">offset docs</a>.</td>
       </tr>
     </tbody>
   </table>
-- 
cgit v1.2.3


From b04e9fb87c8957b33d0a9807e53acfb9f1715bf0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 9 Oct 2016 15:35:52 -0700
Subject: separate out the custom html example

---
 docs/components/tooltips.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 0c8ec2155..b4b28377c 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -103,6 +103,11 @@ Hover over the buttons below to see their tooltips.
 <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="left" title="Tooltip on left">
   Tooltip on left
 </button>
+{% endhighlight %}
+
+And with custom HTML added:
+
+{% highlight html %}
 <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>">
   Tooltip with HTML
 </button>
-- 
cgit v1.2.3


From ab2480f7ca207b457a23a2555b5559c0794c1558 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 9 Oct 2016 20:02:24 -0700
Subject: remove arrow from static html demos

---
 docs/components/tooltips.md | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docs/components/tooltips.md')

diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index b4b28377c..b6dc451ec 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -51,25 +51,21 @@ Four options are available: top, right, bottom, and left aligned.
 
 <div class="bd-example bd-example-tooltip-static">
   <div class="tooltip tooltip-top" role="tooltip">
-    <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the top
     </div>
   </div>
   <div class="tooltip tooltip-right" role="tooltip">
-    <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the right
     </div>
   </div>
   <div class="tooltip tooltip-bottom" role="tooltip">
-    <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the bottom
     </div>
   </div>
   <div class="tooltip tooltip-left" role="tooltip">
-    <div class="tooltip-arrow"></div>
     <div class="tooltip-inner">
       Tooltip on the left
     </div>
-- 
cgit v1.2.3