From: Mark Otto <otto@github.com>
Date: Mon, 14 Oct 2013 01:49:13 +0000 (-0700)
Subject: mention tooltip markup in docs per #10102
X-Git-Tag: v3.0.1~39^2~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd293be5a17aa71128beb1a2152f8eb05107e21c;p=thirdparty%2Fbootstrap.git

mention tooltip markup in docs per #10102
---

diff --git a/javascript.html b/javascript.html
index e0723989e6..4fed27e48e 100644
--- a/javascript.html
+++ b/javascript.html
@@ -847,9 +847,21 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
     </div>
 
     <h2 id="tooltips-usage">Usage</h2>
+    <p>The tooltip plugin generates content and markup on demand, and by default places tooltips after their trigger element.</p>
     <p>Trigger the tooltip via JavaScript:</p>
 {% highlight js %}
 $('#example').tooltip(options)
+{% endhighlight %}
+
+    <h3>Markup</h3>
+    <p>The generated markup of a tooltip is rather simple, though it does require a position (by default, set to <code>top</code> by the plugin).</p>
+{% highlight html linenos %}
+<div class="tooltip">
+  <div class="tooltip-inner">
+    Tooltip!
+  </div>
+  <div class="tooltip-arrow"></div>
+</div>
 {% endhighlight %}
 
     <h3>Options</h3>