aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-22 20:03:17 -0800
committerJacob Thornton <[email protected]>2012-01-22 20:03:17 -0800
commitdc5bedda1441bac36e266f409b3dd14f84e8fd32 (patch)
treee37f903ecad07c345a9efbd4419a87efc399434b /docs/components.html
parent155b72e8730e9b8badb5fa80c8d7f8990f10cc82 (diff)
parent1593671cb2e16947a50b8ce8985a1b2828c92b71 (diff)
downloadbootstrap-dc5bedda1441bac36e266f409b3dd14f84e8fd32.tar.xz
bootstrap-dc5bedda1441bac36e266f409b3dd14f84e8fd32.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/components.html')
-rwxr-xr-x[-rw-r--r--]docs/components.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html
index 7d0593874..984e8c76d 100644..100755
--- a/docs/components.html
+++ b/docs/components.html
@@ -1128,7 +1128,7 @@
<h3>Rewritten base class</h3>
<p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outter <code>&lt;div&gt;</code>.</p>
<h3>Single alert message</h3>
- <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that com with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p>
+ <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p>
<hr>
<h3>Goes great with javascript</h3>
<p>Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.</p>