diff options
| author | Mark Otto <[email protected]> | 2011-08-20 21:14:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-20 21:14:57 -0700 |
| commit | ffd851d93a6616db01db94a945a0dbc2810a5c1a (patch) | |
| tree | 563ac4b1aa7a9b9787ce252798e6c474fabc6f92 /docs | |
| parent | 5a2d1abfbff2bcc8fd5e8faf7f6089d84ccff522 (diff) | |
| parent | 7852619e323973f41a84043a48a359210042644f (diff) | |
| download | bootstrap-ffd851d93a6616db01db94a945a0dbc2810a5c1a.tar.xz bootstrap-ffd851d93a6616db01db94a945a0dbc2810a5c1a.zip | |
fixing conflict to merge in copy changes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/index.html b/docs/index.html index 7244191c9..be40404c1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -317,10 +317,10 @@ </div> <div class="span12 columns"> <h4>When to use</h4> - <p>Emphasis tags (<code><strong></code> and <code><em></code>) should be used to add visual distinction between a word or phrase and its surrounding copy. Use <code><strong></code> for plain old attention and <code><em></code> for <em>slick</em> attention and titles.</p> + <p>Emphasis tags (<code><strong></code> and <code><em></code>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <code><strong></code> for importance and <code><em></code> for <em>stress</em> emphasis.</p> <h3>Emphasis in a paragraph</h3> <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p> - <p><strong>Note:</strong> It’s still okay to use <code><b></code> and <code><i></code> tags in HTML5, but they don’t come with inherent styles anymore. <code><b></code> is meant to convey importance while <code><i></code> is mostly for voice, technical terms, etc.</p> + <p><strong>Note:</strong> It's still okay to use <code><b></code> and <code><i></code> tags in HTML5, but they don't come with inherent styles anymore. <code><b></code> is meant to highlight words or phrases without conveying additional importance, while <code><i></code> is mostly for voice, technical terms, etc.</p> <h3>Addresses</h3> <p>The <code><address></code> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:</p> <address> |