Skip to content

Commit 48202f9

Browse files
committed
Wording tweak for word-break: hyphenate per f2f
1 parent cb818f5 commit 48202f9

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

css3-text/Overview.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484

8585
<h1>CSS Text Level 3</h1>
8686

87-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 29 June 2011</h2>
87+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 July 2011</h2>
8888

8989
<dl>
9090
<dt>This version:
9191

9292
<dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
93-
2011/06/29 00:25:08 $ (CVS $Revision$)</a> <!--
94-
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110629/">http://www.w3.org/TR/2011/WD-css3-text-20110629/</a></dd>
93+
2011/06/29 05:41:07 $ (CVS $Revision$)</a> <!--
94+
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110714/">http://www.w3.org/TR/2011/WD-css3-text-20110714/</a></dd>
9595
-->
9696

9797

@@ -2442,8 +2442,9 @@ <h3 id=word-wrap><span class=secno>7.2. </span> Emergency Wrapping: the
24422442

24432443
<dd>An unbreakable "word" may be hyphenated if there are no
24442444
otherwise-acceptable break points in the line even if hyphenation is
2445-
turned off. Hyphenation controls may influence where the word breaks, but
2446-
cannot forbid the word from hyphenating to prevent overflow.
2445+
turned off or otherwise restricted. Hyphenation controls may influence
2446+
where the word breaks, but cannot forbid the word from hyphenating to
2447+
prevent overflow.
24472448

24482449
<dt><dfn id=break-word
24492450
title="word-wrap:break-word"><code>break-word</code></dfn>
@@ -2461,7 +2462,7 @@ <h3 id=word-wrap><span class=secno>7.2. </span> Emergency Wrapping: the
24612462
&lsquo;<code class=css>min-content</code>&rsquo; intrinsic sizes.
24622463

24632464
<p class=note>This property should have been called &lsquo;<code
2464-
class=property>emergency-wrap</code>&rsquo;, however due to historical
2465+
class=property>overflow-wrap</code>&rsquo;, however due to historical
24652466
reasons it could not be given a less confusing name.
24662467

24672468
<h2 id=justification><span class=secno>8. </span> Alignment and

css3-text/Overview.src.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,8 @@ <h3 id="word-wrap">
17021702
<dt><dfn title="word-wrap:hyphenate"><code>hyphenate</code></dfn></dt>
17031703
<dd>An unbreakable "word" may be hyphenated if there are no
17041704
otherwise-acceptable break points in the line even if hyphenation is
1705-
turned off. Hyphenation controls may influence where the word breaks,
1705+
turned off or otherwise restricted.
1706+
Hyphenation controls may influence where the word breaks,
17061707
but cannot forbid the word from hyphenating to prevent overflow.
17071708
<dt><dfn title="word-wrap:break-word"><code>break-word</code></dfn></dt>
17081709
<dd>An unbreakable "word" may be broken at an arbitrary point if
@@ -1717,7 +1718,7 @@ <h3 id="word-wrap">
17171718
are not considered when calculating ''min-content'' intrinsic
17181719
sizes.
17191720

1720-
<p class="note">This property should have been called 'emergency-wrap',
1721+
<p class="note">This property should have been called 'overflow-wrap',
17211722
however due to historical reasons it could not be given a less
17221723
confusing name.</p>
17231724

0 commit comments

Comments
 (0)