Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

1 files changed, 5 insertions, 1 deletions

diff --git a/docs/css.html b/docs/css.html
index f73be9ac8..9c85d35f6 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1494,12 +1494,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Adding on top of existing browser controls, Bootstrap includes other useful form components.</p>
 
     <h3 id="forms-input-groups">Input groups</h3>
-    <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with a <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p>
+    <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p>
 
     <div class="bs-callout">
       <h4>Cross-browser compatibility</h4>
       <p>Avoid using <code>&lt;select&gt;</code> elements here as they cannot be fully styled in WebKit browsers.</p>
     </div>
+    <div class="bs-callout">
+      <h4>Tooltips &amp; popovers in input groups require special setting</h4>
+      <p>When using tooltips or popovers on elements within an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
+    </div>
 
     <form class="bs-example bs-example-form">
       <div class="input-group col-lg-9">