From 17f2ef46aa68319668ed36f846fc72027b79afda Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 10 Jan 2014 18:47:51 -0800
Subject: docs mention for #12188

---
 docs/components.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index de383557c..c867c6257 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -760,8 +760,8 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
       <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">
-      <h4>Don't mix with form groups</h4>
-      <p>Do not apply input group classes directly to form groups. An input group is an isolated component.</p>
+      <h4>Don't mix with other components</h4>
+      <p>Do not mix form group or grid column classes directly with form groups.</p>
     </div>
 
 
-- 
cgit v1.2.3


From b192d29981a394ea7c7f390d926cedeb8887062f Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Fri, 10 Jan 2014 18:56:39 -0800
Subject: refer to correct component

---
 docs/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index c867c6257..4caa9e6f2 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -761,7 +761,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
     </div>
     <div class="bs-callout bs-callout-info">
       <h4>Don't mix with other components</h4>
-      <p>Do not mix form group or grid column classes directly with form groups.</p>
+      <p>Do not mix form group or grid column classes directly with input groups.</p>
     </div>
 
 
-- 
cgit v1.2.3