From: Chris Rebert <code@rebertia.com>
Date: Thu, 16 Jan 2014 01:07:08 +0000 (-0800)
Subject: reassert #12231 & #12232 (merge went badly?)
X-Git-Tag: v3.1.0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef8d1bad4cb146961c32a063f12a87116214d9e;p=thirdparty%2Fbootstrap.git

reassert #12231 & #12232 (merge went badly?)
---

diff --git a/docs/components.html b/docs/components.html
index f62a833211..259354e7fc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -746,13 +746,13 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
     <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 bs-callout-info">
+  <div class="bs-callout bs-callout-warning">
     <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>
-  <div class="bs-callout bs-callout-info">
+  <div class="bs-callout bs-callout-warning">
     <h4>Don't mix with other components</h4>
-    <p>Do not mix form group or grid column classes directly with input groups.</p>
+    <p>Do not mix form groups or grid column classes directly with input groups. Instead, nest the input group inside of the form group or grid-related element.</p>
   </div>