Merge branch 'master' of github.com:twbs/bootstrap

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>