csswg/css3-text Overview.html,1.86,1.87 Overview.src.html,1.184,1.185

Update of /sources/public/csswg/css3-text
In directory hutz:/tmp/cvs-serv20945

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

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-text/Overview.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- Overview.html	30 Mar 2011 03:24:34 -0000	1.86
+++ Overview.html	30 Mar 2011 03:37:37 -0000	1.87
@@ -89,7 +89,7 @@
     <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 @@
     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
 

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-text/Overview.src.html,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- Overview.src.html	30 Mar 2011 03:24:34 -0000	1.184
+++ Overview.src.html	30 Mar 2011 03:37:38 -0000	1.185
@@ -1131,9 +1131,9 @@
           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

Received on Wednesday, 30 March 2011 03:37:42 UTC