From 242d92e09c60396bad0837581a9692bf7abe8aea Mon Sep 17 00:00:00 2001
From: Chris Rebert <chris.rebert@hulu.com>
Date: Tue, 25 Jun 2013 20:18:30 -0700
Subject: Fix #8287

---
 docs/javascript.html | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 9a5a5b6f0..2580d9a6e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -744,9 +744,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
             </ul>
           </div><!-- /example -->
 
-
-          <h3>Tooltips in input groups</h3>
-          <p>When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.</p>
+          <div class="bs-callout">
+            <h4>Tooltips in button groups and input groups require special setting</h4>
+            <p>When using tooltips on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).</p>
+          </div>
 
           <hr class="bs-docs-separator">
 
@@ -873,6 +874,10 @@ $('#example').tooltip(options)
           <h4>Plugin dependency</h4>
           <p>Popovers require the <a href="#tooltips">tooltip plugin</a> to be included in your version of Bootstrap.</p>
         </div>
+        <div class="bs-callout">
+          <h4>Popovers in button groups and input groups require special setting</h4>
+          <p>When using popovers on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).</p>
+        </div>
 
         <h3>Static popover</h3>
         <p>Four options are available: top, right, bottom, and left aligned.</p>
@@ -1004,7 +1009,7 @@ $('#example').tooltip(options)
               <td>string | false</td>
               <td>false</td>
               <td>
-               <p>Appends the popover to a specific element <code>container: 'body'</code></p>
+               <p>Appends the popover to a specific element. Example: <code>container: 'body'</code></p>
               </td>
             </tr>
           </tbody>
-- 
cgit v1.2.3