aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-10 18:57:01 -0800
committerMark Otto <[email protected]>2014-01-10 18:57:01 -0800
commit8a04ed44a190a276287cec9230794713d6b0dea3 (patch)
treec0d5c7ec9a62b343cf0c4f8424af43d0420c84e7 /docs
parent3a8e99e91eeb03d72c0a015de16f743dd5335312 (diff)
parentb192d29981a394ea7c7f390d926cedeb8887062f (diff)
downloadbootstrap-8a04ed44a190a276287cec9230794713d6b0dea3.tar.xz
bootstrap-8a04ed44a190a276287cec9230794713d6b0dea3.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'docs')
-rw-r--r--docs/components.html2
1 files changed, 1 insertions, 1 deletions
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>