aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-03-01 14:27:04 -0800
committerChris Rebert <[email protected]>2015-03-01 14:27:04 -0800
commita15baba756d0dc3777f636c8fd209f72c1768c92 (patch)
treec25d7f459a71ea143681b3890af927bd729921db
parent1ba2630ccf460106036129086c98c5bacd7baa98 (diff)
parent7b3e4d8423fcf7fa9a488efd9d5bcbd273445a55 (diff)
downloadbootstrap-a15baba756d0dc3777f636c8fd209f72c1768c92.tar.xz
bootstrap-a15baba756d0dc3777f636c8fd209f72c1768c92.zip
Merge pull request #15964 from kkirsche/addAccidentlyRemovedText
[Docs] Replace accidently removed tooltip / popover text
-rw-r--r--docs/_includes/js/popovers.html2
-rw-r--r--docs/_includes/js/tooltips.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index c827a7ff6..3616c1521 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -264,7 +264,7 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
{% highlight js %}$('#element').popover('toggle'){% endhighlight %}
<h4>.popover('destroy')</h4>
- <p>Popovers that use delegation (which are created using <a href="#popovers-options">the <code>selector</code> option</a>) cannot be individually destroyed on descendant trigger elements.</p>
+ <p>Hides and destroys an element's popover. Popovers that use delegation (which are created using <a href="#popovers-options">the <code>selector</code> option</a>) cannot be individually destroyed on descendant trigger elements.</p>
{% highlight js %}$('#element').popover('destroy'){% endhighlight %}
<h3 id="popovers-events">Events</h3>
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 48534ed3e..77a0d5cb5 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -225,7 +225,7 @@ $('#example').tooltip(options)
{% highlight js %}$('#element').tooltip('toggle'){% endhighlight %}
<h4>.tooltip('destroy')</h4>
- <p>Tooltips that use delegation (which are created using <a href="#tooltips-options">the <code>selector</code> option</a>) cannot be individually destroyed on descendant trigger elements.</p>
+ <p>Hides and destroys an element's tooltip. Tooltips that use delegation (which are created using <a href="#tooltips-options">the <code>selector</code> option</a>) cannot be individually destroyed on descendant trigger elements.</p>
{% highlight js %}$('#element').tooltip('destroy'){% endhighlight %}
<h3 id="tooltips-events">Events</h3>