Merge pull request #12232 from twbs/mixing-docs

clarify docs regarding non-mixable components

diff --cc docs/components.html
index a400d216dced9072361e50aaca4ac89ebe2194ba,0db89d977d896a48a28304f2f03b8b739a37c85e..ec15779b134467fe945a17661eef5c91fa3f81d8
--- 1/docs/components.html
--- 2/docs/components.html
+++ b/docs/components.html
@@@ -759,9 -759,9 +759,9 @@@ lead: "Over a dozen reusable component
        <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>
  
  

diff --cc docs/css.html
Simple merge