Add back word-wrap per WG resolution in Hamburg

Author: fantasai

css3-text/Overview.html

@@ -32,14 +32,14 @@
 
    <h1>CSS Text Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 31 July 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 August 2012</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date$ (CVS
      $Revision$)</a> <!--
-    <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120731/">http://www.w3.org/TR/2012/WD-css3-text-20120731/</a></dd>
+    <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120801/">http://www.w3.org/TR/2012/WD-css3-text-20120801/</a></dd>
   -->
 
 
@@ -237,8 +237,8 @@ <h2 class="no-num no-toc" id=contents> Table of Contents</h2>
       Control: the ‘<code class=property>hyphens</code>’ property</a>
 
      <li><a href="#overflow-wrap"><span class=secno>6.2. </span> Overflow
-      Wrapping: the ‘<code class=property>overflow-wrap</code>’
-      property</a>
+      Wrapping: the ‘<code class=property>word-wrap</code>’/‘<code
+      class=property>overflow-wrap</code>’ property</a>
     </ul>
 
    <li><a href="#justification"><span class=secno>7. </span> Alignment and
@@ -1605,15 +1605,17 @@ <h3 id=hyphens><span class=secno>6.1. </span>Hyphenation Control: the ‘<a
   <!-- add a sample prioritization algorithm -->
 
   <h3 id=overflow-wrap><span class=secno>6.2. </span> Overflow Wrapping: the
-   ‘<a href="#overflow-wrap0"><code
-   class=property>overflow-wrap</code></a>’ property</h3>
+   ‘<a href="#word-wrap"><code class=property>word-wrap</code></a>’/‘<a
+   href="#overflow-wrap0"><code class=property>overflow-wrap</code></a>’
+   property</h3>
 
   <table class=propdef>
    <tbody>
     <tr>
      <th>Name:
 
-     <td><dfn id=overflow-wrap0>overflow-wrap</dfn>
+     <td><dfn id=overflow-wrap0>overflow-wrap</dfn>/<dfn
+      id=word-wrap>word-wrap</dfn>
 
     <tr>
      <th><a href="#values">Value</a>:
@@ -1683,10 +1685,11 @@ <h3 id=overflow-wrap><span class=secno>6.2. </span> Overflow Wrapping: the
    are not considered when calculating ‘<code
    class=css>min-content</code>’ intrinsic sizes.
 
-  <p>For legacy reasons, UAs may also accept ‘<code
-   class=property>word-wrap</code>’ as an alternate name for the ‘<a
+  <p>For legacy reasons, UAs must treat ‘<a href="#word-wrap"><code
+   class=property>word-wrap</code></a>’ as an alternate name for the ‘<a
    href="#overflow-wrap0"><code class=property>overflow-wrap</code></a>’
-   property. However this syntax is non-conforming in author style sheets.
+   property, as if it were a shorthand of ‘<a href="#overflow-wrap0"><code
+   class=property>overflow-wrap</code></a>’.
 
   <h2 id=justification><span class=secno>7. </span> Alignment and
    Justification</h2>
@@ -5255,7 +5258,7 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
      <td>visual
 
     <tr>
-     <th><a class=property href="#overflow-wrap0">overflow-wrap</a>
+     <th><span class=property>overflow-wrap/word-wrap</span>
 
      <td>normal | break-word
 

css3-text/Overview.src.html

@@ -1120,13 +1120,13 @@ <h3 id="hyphens">Hyphenation Control: the 'hyphens' property</h3>
     <!-- add a sample prioritization algorithm -->
 
   <h3 id="overflow-wrap">
-    Overflow Wrapping: the 'overflow-wrap' property</h3>
+    Overflow Wrapping: the 'word-wrap'/'overflow-wrap' property</h3>
 
     <table class="propdef">
       <tbody>
         <tr>
           <th>Name:</th>
-          <td><dfn>overflow-wrap</dfn></td>
+          <td><dfn>overflow-wrap</dfn>/<dfn>word-wrap</dfn></td>
         </tr>
         <tr>
           <th><a href="#values">Value</a>:
@@ -1182,9 +1182,8 @@ <h3 id="overflow-wrap">
     <p><i>Soft wrap opportunities</i> not part of ''overflow-wrap: normal'' line breaking
        are not considered when calculating ''min-content'' intrinsic sizes.
 
-    <p>For legacy reasons, UAs may also accept 'word-wrap' as an alternate name
-      for the 'overflow-wrap' property. However this syntax is non-conforming in
-      author style sheets.
+    <p>For legacy reasons, UAs must treat 'word-wrap' as an alternate name
+      for the 'overflow-wrap' property, as if it were a shorthand of 'overflow-wrap'.
 
 <h2 id="justification">
   Alignment and Justification</h2>