Clarify where the content language of an element comes from

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 19 April 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 21 April 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-20120419/">http://www.w3.org/TR/2012/WD-css3-text-20120419/</a></dd>
+    <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120421/">http://www.w3.org/TR/2012/WD-css3-text-20120421/</a></dd>
   -->
 
 
@@ -469,6 +469,23 @@ <h3 id=terms><span class=secno>1.3. </span> Terminology</h3>
    dividing grapheme clusters by element boundaries may give inconsistent or
    undesired results.
 
+  <p>The <dfn id=content-language>content language</dfn> of an element is the
+   (human) language the element is declared to be in, according to the rules
+   of the <a href="http://www.w3.org/CSS21/conform.html#doclanguage">document
+   language</a>. For example, the rules for determining the content language
+   of an HTML element use the <code>lang</code> attribute and are defined in
+   <a href="#HTML5" rel=biblioentry>[HTML5]<!--{{HTML5}}--></a>, and the
+   rules for determining the content language of an XML element use the
+   <code>xml:lang</code> attribute and are <a
+   href="http://www.w3.org/TR/REC-xml/#sec-lang-tag">defined</a> in [[XML]].
+   Note that it is possible for the <a href="#content-language"><i>content
+   language</i></a> of an element to be unknown.
+
+  <p>Other terminology and concepts used in this specification are defined in
+   <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> and <a
+   href="#CSS3-WRITING-MODES"
+   rel=biblioentry>[CSS3-WRITING-MODES]<!--{{!CSS3-WRITING-MODES}}--></a>.
+
   <h2 id=transforming><span class=secno>2. </span> Transforming Text</h2>
 
   <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
@@ -566,9 +583,11 @@ <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
    must use the full case mappings for Unicode characters, including any
    conditional casing rules, as defined in Default Case Algorithm section. If
    (and only if) the content language of the element is, according to the
-   rules of the document language, known, then any appropriate
-   language-specific rules must be applied as well. These minimally include,
-   but are not limited to, the language-specific rules in Unicode's <a
+   rules of the <a
+   href="http://www.w3.org/CSS21/conform.html#doclanguage">document
+   language</a>, known, then any appropriate language-specific rules must be
+   applied as well. These minimally include, but are not limited to, the
+   language-specific rules in Unicode's <a
    href="http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt">SpecialCasing.txt</a>.
 
 
@@ -1611,7 +1630,7 @@ <h3 id=text-wrap><span class=secno>6.1. </span> Text Wrap Settings: the
     <tr>
      <th><a href="#values">Value</a>:
 
-     <td>normal | none | avoid
+     <td>normal | nowrap | avoid
 
     <tr>
      <th>Initial:
@@ -4756,6 +4775,15 @@ <h3 class=no-num id=informative-ref>Informative references</h3>
     </dd>
    <!---->
 
+   <dt id=HTML5>[HTML5]
+
+   <dd>Ian Hickson. <a
+    href="http://www.w3.org/TR/2011/WD-html5-20110525/"><cite>HTML5.</cite></a>
+    25 May 2011. W3C Working Draft. (Work in progress.) URL: <a
+    href="http://www.w3.org/TR/2011/WD-html5-20110525/">http://www.w3.org/TR/2011/WD-html5-20110525/</a>
+    </dd>
+   <!---->
+
    <dt id=JIS4051>[JIS4051]
 
    <dd><cite>Formatting rules for Japanese documents
@@ -5880,7 +5908,7 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
     <tr>
      <th><a class=property href="#text-wrap0">text-wrap</a>
 
-     <td>normal | none | avoid
+     <td>normal | nowrap | avoid
 
      <td>normal
 

css3-text/Overview.src.html

@@ -192,6 +192,20 @@ <h3 id="terms">
     to both. Authors are forewarned that dividing grapheme clusters by
     element boundaries may give inconsistent or undesired results.
 
+  <p>The <dfn>content language</dfn> of an element is the (human) language
+    the element is declared to be in, according to the rules of the
+    <a href="http://www.w3.org/CSS21/conform.html#doclanguage">document language</a>.
+    For example, the rules for determining the content language of an HTML
+    element use the <code>lang</code> attribute and are defined in [[HTML5]],
+     and the rules for determining the content language of an XML element use
+    the <code>xml:lang</code> attribute and are
+    <a href="http://www.w3.org/TR/REC-xml/#sec-lang-tag">defined</a> in [[XML]].
+    Note that it is possible for the <i>content language</i> of an element
+    to be unknown.
+
+  <p>Other terminology and concepts used in this specification are defined
+    in [[!CSS21]] and [[!CSS3-WRITING-MODES]].
+
 <h2 id="transforming">
   Transforming Text</h2>
 
@@ -268,7 +282,8 @@ <h3 id="text-transform">
       [[!UNICODE]]. The UA must use the full case mappings for Unicode
       characters, including any conditional casing rules, as defined in
       Default Case Algorithm section. If (and only if) the content language
-      of the element is, according to the rules of the document language,
+      of the element is, according to the rules of the
+      <a href="http://www.w3.org/CSS21/conform.html#doclanguage">document language</a>,
       known, then any appropriate language-specific rules must be applied
       as well.
       These minimally include, but are not limited to, the language-specific