Make only conditional hyphens disable auto-hyphenation. <http://lists.w3.org/Archives/Public/www-style/2011Mar/0703.html>

Author: fantasai

css3-text/Overview.html

@@ -89,7 +89,7 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 30 March 2011</h2>
     <dt>This version:
 
     <dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
-     2011/03/30 00:37:40 $ (CVS $Revision$)</a> <!--
+     2011/03/30 03:24:34 $ (CVS $Revision$)</a> <!--
       <dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110330/">http://www.w3.org/TR/2011/WD-css3-text-20110330/</a></dd>
     -->
 
@@ -1670,9 +1670,9 @@ <h3 id=hyphens><span class=secno>6.1. </span>Hyphenation Control: the
     determined by hyphenation characters inside the word or as determined
     automatically by a language-appropriate hyphenation resource (such as
     those provided via &lsquo;<code
-    class=css>@hyphenation-resource</code>&rsquo;). Explicit hyphenation
-    characters inside a word take priority over automatic resources when
-    determining hyphenation points within the word.
+    class=css>@hyphenation-resource</code>&rsquo;). Conditional hyphenation
+    characters inside a word, if present, take priority over automatic
+    resources when determining hyphenation points within the word.
 
    <dt>all
 

css3-text/Overview.src.html

@@ -1131,9 +1131,9 @@ <h3 id="hyphens">Hyphenation Control: the 'hyphens' property</h3>
           determined by hyphenation characters inside the word or as
           determined automatically by a language-appropriate hyphenation
           resource (such as those provided via ''@hyphenation-resource'').
-          Explicit hyphenation characters inside a word take priority over
-          automatic resources when determining hyphenation points within
-          the word.
+          Conditional hyphenation characters inside a word, if present,
+          take priority over automatic resources when determining
+          hyphenation points within the word.
       <dt>all
         <dd>All possible hyphenation points, as would be determined for ''auto'',
           are marked. The visual appearance of the mark is UA-dependent. This