W3C home > Mailing lists > Public > public-html-diffs@w3.org > July 2009

mike: reworked the definitions of different types of "character data" and what element "contents" are, to try to make things more clear; removed "Authors should not" admonitions about particular encodings; restate text about doctype vs. doctype.legacy in terms of document conformance (instead of authoring conformance); streamlined the definition of what a comment is; refined CSS stylesheet to make Notes more clearly identifiable

From: poot <cvsmail@w3.org>
Date: Wed, 8 Jul 2009 19:31:37 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090708103137.4A7DE2BC5F@toro.w3.mag.keio.ac.jp>
mike: reworked the definitions of different types of "character data"
and what element "contents" are, to try to make things more clear;
removed "Authors should not" admonitions about particular encodings;
restate text about doctype vs. doctype.legacy in terms of document
conformance (instead of authoring conformance); streamlined the
definition of what a comment is; refined CSS stylesheet to make Notes
more clearly identifiable

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.321&r2=1.322&f=h

===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- body.html	29 Jun 2009 09:18:45 -0000	1.6
+++ body.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#body-content">#</a></h2>
         <div class="content-models" id="body-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="body-mdl" href="body.html#body-mdl" class="element">body</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="body.html#body.attrs">body.attrs</a>
     </span></p>

Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- legend.html	29 Jun 2009 09:18:47 -0000	1.6
+++ legend.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#legend-content">#</a></h2>
         <div class="content-models" id="legend-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="legend-mdl" href="legend.html#legend-mdl" class="element">legend</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="legend.html#legend.attrs">legend.attrs</a>
     </span></p>
@@ -48,16 +48,16 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#legend-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="figure.html#figure-mdl">figure</a> = (<a class="ref" href="legend.html#legend">legend</a>,
-   (<a href="syntax.html#character-data">character data</a>
+   (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a href="syntax.html#character-data">character data</a>
+  | ((<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
      <a class="ref" href="legend.html#legend">legend</a>?)</li>
         <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a>?,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="details.html#details-mdl">details</a> = <a class="ref" href="legend.html#legend">legend</a>,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
       </div>
       <div class="no-number no-toc" id="legend-display">

Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- address.html	29 Jun 2009 09:18:44 -0000	1.6
+++ address.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -25,7 +25,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#address-content">#</a></h2>
         <div class="content-models" id="address-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="address-mdl" href="address.html#address-mdl" class="element">address</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="address.html#address.attrs">address.attrs</a>
     </span></p>

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- th.html	29 Jun 2009 09:18:49 -0000	1.6
+++ th.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#th-content">#</a></h2>
         <div class="content-models" id="th-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="th-mdl" href="th.html#th-mdl" class="element">th</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="th.html#th.attrs">th.attrs</a>
     </span></p>

Index: bb.html
===================================================================
RCS file: /sources/public/html5/markup/bb.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bb.html	29 Jun 2009 09:18:45 -0000	1.6
+++ bb.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#bb-content">#</a></h2>
         <div class="content-models" id="bb-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="bb-mdl" href="bb.html#bb-mdl" class="element">bb</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="bb.html#bb.attrs">bb.attrs</a>
     </span></p>

Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mark.html	29 Jun 2009 09:18:48 -0000	1.6
+++ mark.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#mark-content">#</a></h2>
         <div class="content-models" id="mark-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="mark-mdl" href="mark.html#mark-mdl" class="element">mark</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="mark.html#mark.attrs">mark.attrs</a>
     </span></p>

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- Overview.html	1 Jul 2009 14:12:02 -0000	1.321
+++ Overview.html	8 Jul 2009 10:31:00 -0000	1.322
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>1 July 2009</em>
+<h2>Editor&#8217;s Draft <em>8 July 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 1 July 2009 Editor&#8217;s Draft of 
+        This document is the 8 July 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iframe.html	29 Jun 2009 09:18:47 -0000	1.7
+++ iframe.html	8 Jul 2009 10:31:01 -0000	1.8
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content">#</a></h2>
         <div class="content-models" id="iframe-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span>
-      character data
+      normal character data
       &amp; <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
@@ -122,8 +122,7 @@
       <div class="no-number no-toc" id="iframe-display">
         <h2 class="element-subhead">Typical default display properties <a class="hash" href="#iframe-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
         <div class="css-props" id="iframe-css"><div class="selectors"><span class="selector">iframe</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">border</span>: <span class="prop-value">2px inset</span>; }</div></div><div class="selectors"><span class="selector">iframe</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">overflow</span>: <span class="prop-value">hidden</span>; }</div></div></div></div></div>
+</div><div class="properties"><div class="css-property"><span class="prop-name">border</span>: <span class="prop-value">2px inset</span>; }</div></div></div></div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="i.html">&#171; i</a></span>

Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- datagrid.html	29 Jun 2009 09:18:45 -0000	1.9
+++ datagrid.html	8 Jul 2009 10:31:01 -0000	1.10
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#datagrid-content">#</a></h2>
         <div class="content-models" id="datagrid-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="datagrid.html#datagrid-mdl" class="element">datagrid</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="datagrid.html#datagrid.attrs">datagrid.attrs</a>
     </span></p>

Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ins.html	29 Jun 2009 09:18:47 -0000	1.9
+++ ins.html	8 Jul 2009 10:31:01 -0000	1.10
@@ -23,13 +23,13 @@
         <dl class="content-models" id="ins-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="ins.elem.flow"><a class="hash" href="ins.html#ins.elem.flow"><span class="element">ins</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="ins.elem.phrasing"><a class="hash" href="ins.html#ins.elem.phrasing"><span class="element">ins</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
     </span></dd>

Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- abbr.html	29 Jun 2009 09:18:44 -0000	1.6
+++ abbr.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -25,7 +25,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#abbr-content">#</a></h2>
         <div class="content-models" id="abbr-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="abbr-mdl" href="abbr.html#abbr-mdl" class="element">abbr</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a>
     </span></p>

Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- div.html	29 Jun 2009 09:18:46 -0000	1.6
+++ div.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -29,7 +29,7 @@
         <div class="content-models" id="div-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="div-mdl" href="div.html#div-mdl" class="element">div</a> = </span><span>
       <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="div.html#div.attrs">div.attrs</a>
     </span></p>

Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dt.html	29 Jun 2009 09:18:46 -0000	1.6
+++ dt.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -29,7 +29,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dt-content">#</a></h2>
         <div class="content-models" id="dt-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dt-mdl" href="dt.html#dt-mdl" class="element">dt</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="dt.html#dt.attrs">dt.attrs</a>
     </span></p>

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nav.html	29 Jun 2009 09:18:48 -0000	1.8
+++ nav.html	8 Jul 2009 10:31:02 -0000	1.9
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#nav-content">#</a></h2>
         <div class="content-models" id="nav-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="nav-mdl" href="nav.html#nav-mdl" class="element">nav</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="nav.html#nav.attrs">nav.attrs</a>
     </span></p>

Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- footer.html	29 Jun 2009 09:18:46 -0000	1.8
+++ footer.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#footer-content">#</a></h2>
         <div class="content-models" id="footer-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="footer-mdl" href="footer.html#footer-mdl" class="element">footer</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="footer.html#footer.attrs">footer.attrs</a>
     </span></p>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- script.html	29 Jun 2009 09:18:48 -0000	1.7
+++ script.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -23,7 +23,7 @@
         <dl class="content-models" id="script-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="script.html#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
       &amp; <a class="ref" href="script.html#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
     </span></dd>

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- audio.html	29 Jun 2009 09:18:44 -0000	1.8
+++ audio.html	8 Jul 2009 10:31:00 -0000	1.9
@@ -24,7 +24,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
     </span></dd>
@@ -32,7 +32,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
     </span></dd>

Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- time.html	29 Jun 2009 09:18:49 -0000	1.6
+++ time.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#time-content">#</a></h2>
         <div class="content-models" id="time-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="time-mdl" href="time.html#time-mdl" class="element">time</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="time.html#time.attrs">time.attrs</a>
     </span></p>

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- progress.html	29 Jun 2009 09:18:48 -0000	1.6
+++ progress.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#progress-content">#</a></h2>
         <div class="content-models" id="progress-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="progress-mdl" href="progress.html#progress-mdl" class="element">progress</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="progress.html#progress.attrs">progress.attrs</a>
     </span></p>

Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dfn.html	29 Jun 2009 09:18:46 -0000	1.6
+++ dfn.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dfn-content">#</a></h2>
         <div class="content-models" id="dfn-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dfn-mdl" href="dfn.html#dfn-mdl" class="element">dfn</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a>
     </span></p>

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- textarea.html	29 Jun 2009 09:18:49 -0000	1.6
+++ textarea.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#textarea-content">#</a></h2>
         <div class="content-models" id="textarea-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="textarea-mdl" href="textarea.html#textarea-mdl" class="element">textarea</a> = </span><span>
-      character data
+      normal character data
       &amp; <a class="ref" href="textarea.html#textarea.attrs">textarea.attrs</a>
     </span></p>
         </div>

Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cite.html	29 Jun 2009 09:18:45 -0000	1.6
+++ cite.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#cite-content">#</a></h2>
         <div class="content-models" id="cite-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="cite-mdl" href="cite.html#cite-mdl" class="element">cite</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="cite.html#cite.attrs">cite.attrs</a>
     </span></p>

Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meter.html	29 Jun 2009 09:18:48 -0000	1.6
+++ meter.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#meter-content">#</a></h2>
         <div class="content-models" id="meter-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="meter-mdl" href="meter.html#meter-mdl" class="element">meter</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="meter.html#meter.attrs">meter.attrs</a>
     </span></p>

Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- aside.html	29 Jun 2009 09:18:44 -0000	1.8
+++ aside.html	8 Jul 2009 10:31:00 -0000	1.9
@@ -25,7 +25,7 @@
         <div class="content-models" id="aside-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="aside-mdl" href="aside.html#aside-mdl" class="element">aside</a> = </span><span>
       <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="aside.html#aside.attrs">aside.attrs</a>
     </span></p>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- syntax.html	29 Jun 2009 09:18:49 -0000	1.10
+++ syntax.html	8 Jul 2009 10:31:03 -0000	1.11
@@ -42,11 +42,14 @@
     <p>A <dfn id="doctype" title="syntax-doctype">DOCTYPE</dfn> is
     an special instruction which, for legacy reasons that have to
     do with processing modes in browsers, is a required part of
-    any <a href="html-and-xhtml.html#syntax-document-html">document in the HTML
-      syntax</a>.</p>
-    <p>Except in documents output from certain tools, the DOCTYPE
-    must match the regular expression in the following pattern
-    definition.</p>
+    any
+    <a href="html-and-xhtml.html#syntax-document-html">document in the HTML syntax</a>.</p>
+    <p>The DOCTYPE must match either the
+    <a href="syntax.html#doctype.pattern">doctype</a>
+    or
+    <a href="syntax.html#doctype.legacy">doctype.legacy</a>
+    patterns defined this specification.</p>
+    <p>The <code>doctype</code> pattern is defined as follows:</p>
     <dl class="pattern-def">
       <dt><a id="doctype.pattern" href="syntax.html#doctype.pattern">doctype</a> =</dt>
       <dd>
@@ -62,9 +65,7 @@
     <pre>&lt;!doctype html&gt;</pre>
     <pre>&lt;!DOCTYPE HTML&gt;</pre>
     </div>
-    <p>In documents output from tools that are incapable of
-    generating a DOCTYPE in the form above, the DOCTYPE must match
-    the regular expression in the following pattern definition.</p>
+    <p>The <code>doctype.legacy</code> pattern is defined as follows:</p>
     <dl class="pattern-def">
       <dt><a id="doctype.legacy" href="syntax.html#doctype.legacy">doctype.legacy</a> =</dt>
       <dd>
@@ -82,10 +83,11 @@
     <pre>&lt;!doctype html public 'about:legacy-compat'&gt;</pre>
     <pre>&lt;!DOCTYPE HTML PUBLIC "about:legacy-compat"&gt;</pre>
     </div>
-    <p>A document must not use a DOCTYPE matching the
-    <a href="syntax.html#doctype.legacy">doctype.legacy</a>
-    pattern unless the document is output from a tool that is
-    incapable of generating a DOCTYPE matching the
+    <p>A tool that produces documents that conform to this
+    specification should not produce documents with a DOCTYPE
+    matching the <a href="syntax.html#doctype.legacy">doctype.legacy</a>
+    pattern unless the tool is incapable of generating a DOCTYPE
+    matching the
     <a href="syntax.html#doctype.pattern">doctype</a> pattern.</p>
   </div>
   <div id="character-encoding" class="section">
@@ -99,7 +101,6 @@
     <ul>
       <li>The character encoding name given must be the name of
       the character encoding used to serialize the file.</li>
-
       <li>The value must be a valid character encoding name, and
       must be the preferred name for that encoding.
       <a href="references.html#refsIANACHARSET">[IANACHARSET]</a></li>
@@ -137,14 +138,17 @@
     ANSI_X3.4-1968) for bytes in the set 0x09, 0x0A, 0x0C, 0x0D,
     0x20 - 0x22, 0x26, 0x27, 0x2C - 0x3F, 0x41 - 0x5A, and 0x61 -
     0x7A.</p>
-    <p>Authors should not use JIS_X0212-1990, x-JIS0208, and
-    encodings based on EBCDIC. Authors should not use UTF-32.
-    Authors must not use the CESU-8, UTF-7, BOCU-1 and SCSU
+    <p>
+    
+    
+    
+    Documents must not use the CESU-8, UTF-7, BOCU-1 and SCSU
     encodings.
     <a href="references.html#refsCESU8">[CESU8]</a>
     <a href="references.html#refsUTF7">[UTF7]</a>
     <a href="references.html#refsBOCU1">[BOCU1]</a>
-    <a href="references.html#refsSCSU">[SCSU]</a></p>
+    <a href="references.html#refsSCSU">[SCSU]</a>
+    </p>
     <p>In a
     <a href="html-and-xhtml.html#syntax-document-xml">document the XML syntax</a>,
     the XML declaration should be used to provide
@@ -159,18 +163,22 @@
     specification defines the content models for all elements.
     An element must not contain <a href="syntax.html#contents">contents</a>
     or attributes that are not part of its content model.</p>
-    <p>The <dfn id="contents" title="contents">contents</dfn> of
-    an element are any elements, <a href="syntax.html#syntax-text">text</a>,
-    <a href="syntax.html#syntax-charref">character references</a>,
-    <a href="syntax.html#syntax-cdata-sections">CDATA sections</a>,
-    or
+    <p>The
+    <dfn id="contents" title="contents">contents</dfn>
+    of an element are any
+    <a href="syntax.html#syntax-elements">elements</a>,
+    <a href="syntax.html#character-data">character data</a>,
+    and
     <a href="syntax.html#syntax-comments">comments</a>
     that it contains.
     Attributes and their values are not considered to be the
     &#8220;contents&#8221; of an element.</p>
     <p>An element whose <a href="syntax.html#content-model">content model</a>
-    does not allow it to have <a href="contents" title="contents">contents</a> is said to be a <dfn id="void-element" title="void-element">void
-      element</dfn>. Void elements can have attributes.</p>
+    does not allow it to have
+    <a href="syntax.html#contents">contents</a>
+    is said to be a
+    <dfn id="void-element" title="void-element">void element</dfn>.
+    Void elements can have attributes.</p>
     <p>The following is a complete list of the void elements in
     HTML.</p>
     <dl>
@@ -222,28 +230,23 @@
       <ol>
         <li>The first character of a start tag must be a U+003C
         LESS-THAN SIGN (<code>&lt;</code>).</li>
-
         <li>The next
         few characters of a start tag must be the element's
         <a href="syntax.html#tag-name" title="syntax-tag-name">tag name</a>.</li>
-
         <li>If there are to be any attributes in the next step,
         there must first be one or more
         <a href="terminology.html#space" title="space character">space characters</a>.</li>
-
         <li>Then, the start tag may have
         a number of attributes, the
         <a href="syntax.html#attribute" title="syntax-attributes">syntax for which</a> is
         described below. Attributes may be separated from each
         other by one or more
         <a href="terminology.html#space" title="space character">space characters</a>.</li>
-
         <li>After the attributes, the start tag may have one or more
         <a href="terminology.html#space" title="space character">space characters</a>. (Some
         attributes are required to be followed by a space. See the
         <a href="syntax.html#attribute" title="syntax-attributes">attributes section</a>
         below.)</li>
-
         <li>Start tags must be closed by a U+003E GREATER-THAN
         SIGN (<code>&gt;</code>) character.</li>
       </ol>
@@ -287,40 +290,6 @@
     (which again,
     <a href="syntax.html#omitted" title="syntax-tag-omission">might be
       implied in certain cases</a>).</li>
-    <li>The <a href="style.html#style">style</a> and <a href="script.html#script">script</a> elements can have
-      <a href="syntax.html#syntax-text">text</a>, though it has
-      <a href=".html#text-restrictions">restrictions</a> described in a
-      later section.</li>
-    <li>The 
-      <a href="title.html#title">title</a>
-      and
-      <a href="textarea.html#textarea">textarea</a>
-      elements can have
-      <a href="syntax.html#syntax-text">text</a>
-      and
-      <a href="syntax.html#syntax-charref">character references</a>,
-      but the text must not contain an
-      <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersand</a>.
-    There are also
-    <a href=".html#text-restrictions">further restrictions</a>
-    described in a later section.</li>
-  <li>Non-<a href="syntax.html#void-element">void</a> elements other
-    than the
-    <a href="style.html#style">style</a>,
-    <a href="script.html#script">script</a>,
-    <a href="title.html#title">title</a>,
-    and
-    <a href="textarea.html#textarea">textarea</a>
-    elements can contain
-    <a href="syntax.html#syntax-text">text</a>,
-    <a href="syntax.html#syntax-charref">character references</a>,
-    other
-    <a href="syntax.html#syntax-elements">elements</a>,
-    and
-    <a href="syntax.html#syntax-comments">comments</a>.
-    But the text must not contain the character U+003C LESS-THAN SIGN
-    (<code>&lt;</code>) or an
-    <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersand</a>.</li>
     </ul>
   </div>
     <div id="syntax-attributes" class="section">
@@ -366,10 +335,7 @@
       <li>
       <dfn id="syntax-attribute-value">Attribute values</dfn>, in
       general, are
-      <a href="syntax.html#character-data">character data</a>,
-      with the additional restriction that they must not
-      contain any
-      <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</li>
+      <a href="syntax.html#normal-character-data">normal character data</a>.</li>
     </ul>
     <p>In the <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>,
     attributes can be specified in four different ways:</p>
@@ -502,64 +468,152 @@
     </div>
   <div id="text-syntax" class="section">
     <h2>6.5. Text and character data <a class="hash" href="#text-syntax">#</a> <a class="toc-bak" href="Overview.html#text-syntax-toc">T</a></h2>
-    <p><dfn id="syntax-text" title="syntax-text">Text</dfn> in
-      <a href="syntax.html#contents">element contents</a>,
-      <a href="syntax.html#syntax-attribute-value">attribute values</a>,
-      <a href="syntax.html#syntax-comments">comments</a>,
+    <p><dfn id="syntax-text" title="syntax-text">Text</dfn>
+    in
+      <a href="syntax.html#contents">element contents</a>
+      (including in
+      <a href="syntax.html#syntax-comments">comments</a>)
       and
-      <a href="syntax.html#syntax-escape">escaping text spans</a>
-    must consist of Unicode characters and must not contain any of
-    the following:</p>
+      <a href="syntax.html#syntax-attribute-value">attribute values</a>
+      must consist of Unicode characters, with the following
+      restrictions:</p>
     <ul>
-      <li>U+0000 characters</li>
-      <li>permanently undefined Unicode characters</li>
-      <li>control characters other than
+      <li>must not contain U+0000 characters</li>
+      <li>must not contain permanently undefined Unicode characters</li>
+      <li>must not contain control characters other than
         <a href="terminology.html#space">space characters</a></li>
     </ul>
-    <p><a href="syntax.html#syntax-text">Text</a> can be combined with
-      <a href="syntax.html#syntax-charref">character references</a>,
-      <a href="syntax.html#syntax-escape">escaping text spans</a>
-      in three different ways:</p>
-    <ul>
-      <li><dfn id="character-data">character data</dfn>
-      can contain
-      <a href="syntax.html#syntax-text">text</a>
-      and
-      <a href="syntax.html#syntax-charref">character references</a>,
-      but must not contain
-      <a href="syntax.html#syntax-escape">escaping text spans</a></li>
-      <li><dfn id="replaceable-character-data">replaceable character data</dfn>
-      can contain
-      <a href="syntax.html#syntax-text">text</a>,
-      <a href="syntax.html#syntax-charref">character references</a>,
-      and 
-      <a href="syntax.html#syntax-escape">escaping text spans</a>,
-      but must not contain any occurrences of the string
-      "<code>&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
-      SOLIDUS) followed by characters that case-insensitively
-      match the tag name of the element followed by one of
-      U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF),
-      U+000C FORM FEED (FF), U+0020 SPACE, U+003E GREATER-THAN
-      SIGN (&gt;), or U+002F SOLIDUS (/), unless that string is
-      part of an
-      <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
-      <li><dfn id="non-replaceable-character-data">non-replaceable character data</dfn>
-      can contain
-      <a href="syntax.html#syntax-text">text</a>,
-      and 
-      <a href="syntax.html#syntax-escape">escaping text spans</a>
-      but must not contain
-      <a href="syntax.html#syntax-charref">character references</a>,
-      and must not contain any occurrences of the string
-      "<code>&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
-      SOLIDUS) followed by characters that case-insensitively
-      match the tag name of the element followed by one of
-      U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF),
-      U+000C FORM FEED (FF), U+0020 SPACE, U+003E GREATER-THAN
-      SIGN (&gt;), or U+002F SOLIDUS (/), unless that string is
-      part of an
-      <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
-    </ul>
+    <p class="note">There is a special type of
+    <a href="syntax.html#syntax-text">text</a>,
+    known as an
+    <a href="syntax.html#syntax-escape">escaping text span</a>,
+    that can occur within certain elements.</p>
+    <p><dfn id="character-data" title="character-data">Character data</dfn> contains
+    <a href="syntax-text">text</a>, in some cases in combination with
+    <a href="syntax.html#syntax-charref">character references</a>),
+    along with certain additional restrictions. There are three
+    types of character data that can occur in documents:</p>
+    <ol>
+      <li><a href="syntax.html#normal-character-data">normal character data</a></li>
+      <li><a href="syntax.html#replaceable-character-data">replaceable character data</a></li>
+      <li><a href="syntax.html#non-replaceable-character-data">non-replaceable character data</a></li>
+    </ol>
+    <dl id="character-data-types-list">
+      <dt><dfn id="normal-character-data" title="normal-character-data">Normal character data</dfn></dt>
+      <dd>
+        <p>Certain elements and strings in the values of
+        particular attributes contain normal character data.
+        Normal character data can contain the following:</p>
+        <ul>
+          <li><a href="syntax.html#syntax-text">text</a></li>
+          <li><a href="syntax.html#syntax-charref">character references</a></li>
+        </ul>
+        <p>Normal character data has the following restrictions:</p>
+        <ul>
+          <li>must not contain any
+          "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
+          characters</li>
+          <li>must not contain any
+          <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
+          <li>must not contain any
+          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+        </ul>
+      </dd>
+      <dt><dfn id="replaceable-character-data" title="replaceable-character-data">Replaceable character data</dfn></dt>
+      <dd>
+        <p>In
+        <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>,
+        the
+        <a href="title.html#title" class="element">title</a>
+        and 
+        <a href="textarea.html#textarea" class="element">textarea</a>
+        elements can contain replaceable character data.
+        Replaceable character data can contain the following:</p>
+        <ul>
+          <li><a href="syntax.html#syntax-text">text</a>,
+          optionally including
+          "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
+          characters and
+          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+          <li><a href="syntax.html#syntax-charref">character references</a></li>
+        </ul>
+        <p>Replaceable character data has the following restrictions:</p>
+        <ul>
+          <li>must not contain any
+          <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
+          <li>must not contain any occurrences of the string
+          "<code>&lt;/</code>" (U+003C LESS-THAN SIGN,
+          U+002F SOLIDUS) followed by characters that
+          case-insensitively match the tag name of the
+          element containing the replaceable character data
+          (for example, "<code>&lt;/title</code>" or
+          "<code>&lt;/textarea</code>"),
+          followed by one of U+0009 CHARACTER TABULATION,
+          U+000A LINE FEED (LF), U+000C FORM FEED (FF),
+          U+0020 SPACE, U+003E GREATER-THAN SIGN (&gt;), or
+          U+002F SOLIDUS (/), unless that string is part of
+          an
+          <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
+        </ul>
+        <p class="note">Replaceable character data,
+        as defined in this specification, is a feature of
+        <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>
+        that is not available in
+        <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>.
+        <a href="html-and-xhtml.html#syntax-document-xml">Documents in the XML
+          syntax</a> must not contain replaceable character data
+        as defined in this specification; instead they must
+        conform to all syntax constraints defined in the XML
+        specification <a href="references.html#refsXML">[XML]</a>.</p>
+      </dd>
+      <dt><dfn id="non-replaceable-character-data" title="non-replaceable-character-data">Non-replaceable character data</dfn></dt>
+      <dd>
+        <p>In
+        <a href="html-and-xhtml.html#syntax-document-html">documents in the HTML syntax</a>,
+        the
+        <a href="script.html#script" class="element">script</a>
+        and 
+        <a href="style.html#style" class="element">style</a>
+        elements can contain non-replaceable character data.
+        Non-replaceable character data can contain the
+        following:</p>
+        <ul>
+          <li><a href="syntax.html#syntax-text">text</a>,
+          optionally including
+          "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
+          characters and
+          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+          <li><a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
+        </ul>
+        <p>Non-replaceable character data has the following restrictions:</p>
+        <ul>
+          <li>must not contain <a href="syntax.html#syntax-charref">character references</a></li>
+          <li>must not contain any occurrences of the string
+          "<code>&lt;/</code>" (U+003C LESS-THAN SIGN,
+          U+002F SOLIDUS) followed by characters that
+          case-insensitively match the tag name of the
+          element containing the replaceable character data
+          (for example, "<code>&lt;/script</code>" or
+          "<code>&lt;/style</code>"),
+          followed by one of U+0009 CHARACTER TABULATION,
+          U+000A LINE FEED (LF), U+000C FORM FEED (FF),
+          U+0020 SPACE, U+003E GREATER-THAN SIGN (&gt;), or
+          U+002F SOLIDUS (/), unless that string is part of
+          an
+          <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
+        </ul>
+        <p class="note">Non-replaceable character data,
+        as defined in this specification, is a feature of
+        <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>
+        that is not available in
+        <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>.
+        <a href="html-and-xhtml.html#syntax-document-xml">Documents in the XML
+          syntax</a> must not contain non-replaceable character
+        data as defined in this specification; instead they must
+        conform to all syntax constraints defined in the XML
+        specification <a href="references.html#refsXML">[XML]</a>.</p>
+      </dd>
+    </dl>
   </div>
   <div id="character-references" class="section">
     <h2>6.6. Character references <a class="hash" href="#character-references">#</a> <a class="toc-bak" href="Overview.html#character-references-toc">T</a></h2>
@@ -574,7 +628,7 @@
         names defined in <cite>XML Entity definitions
           for Characters</cite> <a href="references.html#refsEntities">[Entities]</a>, using the same
         case, terminated by a U+003B SEMICOLON (<code title="">;</code>) character.</dd>
-      <dt><dfn id="dec-charref">Decimal numeric character reference.</dfn></dt>
+      <dt><dfn id="dec-charref">Decimal numeric character reference</dfn></dt>
       <dd>The ampersand must be followed by a U+0023 NUMBER SIGN
       (<code>#</code>) character, followed by one or more digits in
       the range U+0030 DIGIT ZERO .. U+0039 DIGIT NINE, representing
@@ -611,21 +665,29 @@
     <h2>6.7. Comments <a class="hash" href="#comments">#</a> <a class="toc-bak" href="Overview.html#comments-toc">T</a></h2>
     <p>
     <dfn id="syntax-comments" title="syntax-comments">Comments</dfn>
-    must start with the four character sequence U+003C LESS-THAN
-    SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D
-    HYPHEN-MINUS (<code title="">&lt;!--</code>). Following that
-    sequence, the comment may have
-    <a href="syntax.html#syntax-text" title="syntax-text">text</a>, with the
-    additional restriction that the text must not start with a
-    single U+003E GREATER-THAN SIGN ('&gt;') character, nor start
-    with a U+002D HYPHEN-MINUS (<code title="">-</code>) character
-    followed by a U+003E GREATER-THAN SIGN ('&gt;') character, nor
-    contain two consecutive U+002D HYPHEN-MINUS
-    (<code title="">-</code>) characters, nor end with a U+002D
-    HYPHEN-MINUS (<code title="">-</code>) character. Finally, the
-    comment must be ended by the three character sequence U+002D
-    HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN
-    (<code title="">--&gt;</code>).</p>
+    consist of the following three parts, in exactly the following
+    order:</p>
+    <ol>
+      <li>the string
+      "<code title="U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS">&lt;!--</code>"
+      </li>
+      <li><a href="syntax.html#syntax-text">text</a></li>
+      <li>the string
+      "<code title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN">--&gt;</code>"
+      </li>
+    </ol>
+    <p>The <a href="syntax.html#syntax-text">text</a>
+    part of comments has the following restrictions:</p>
+    <ul>
+      <li>must not start with a
+      "<code title="U+003E GREATER-THAN SIGN">&gt;</code>" character</li>
+      <li>must not start with the string
+      "<code title="U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN">-&gt;</code>"</li>
+      <li>must not contain the string
+      "<code title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS">--</code>"</li>
+      <li>must not end with a
+      "<code title="U+002D HYPHEN-MINUS">-</code>" character</li>
+    </ul>
     <div class="example">
     <p>The following is an example of a comment.</p>
     <pre>&lt;!-- main content starts here --&gt;</pre>

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- section.html	29 Jun 2009 09:18:48 -0000	1.10
+++ section.html	8 Jul 2009 10:31:02 -0000	1.11
@@ -23,7 +23,7 @@
         <div class="content-models" id="section-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="section-mdl" href="section.html#section-mdl" class="element">section</a> = </span><span>
       <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="section.html#section.attrs">section.attrs</a>
     </span></p>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- area.html	29 Jun 2009 09:18:44 -0000	1.6
+++ area.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -51,7 +51,7 @@
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#area-attributes">#</a></h2>
         <dl class="attr-defs">
             <dt><a class="attribute-name" id="area.attrs.alt" title="area.attrs.alt" href="area.html#area.attrs.alt">alt</a><span class="attr-values"> = 
-      <a href="syntax.html#character-data">character data</a>
+      <a href="syntax.html#normal-character-data">normal character data</a>
     </span> </dt>
             <dd>The text of the hyperlink.</dd>
           

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- samp.html	29 Jun 2009 09:18:48 -0000	1.6
+++ samp.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#samp-content">#</a></h2>
         <div class="content-models" id="samp-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="samp-mdl" href="samp.html#samp-mdl" class="element">samp</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="samp.html#samp.attrs">samp.attrs</a>
     </span></p>

Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h6.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h6.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h6-content">#</a></h2>
         <div class="content-models" id="h6-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h6-mdl" href="h6.html#h6-mdl" class="element">h6</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h6.html#h6.attrs">h6.attrs</a>
     </span></p>

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a.html	29 Jun 2009 09:18:44 -0000	1.6
+++ a.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -21,13 +21,13 @@
         <dl class="content-models" id="a-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="a.html#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="a.elem.flow"><a class="hash" href="a.html#a.elem.flow"><span class="element">a</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
     </span></dd>

Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- object.html	29 Jun 2009 09:18:48 -0000	1.8
+++ object.html	8 Jul 2009 10:31:02 -0000	1.9
@@ -26,14 +26,14 @@
         <dt class="content-model"><span class="element-pattern-name" id="object.elem.flow"><a class="hash" href="object.html#object.elem.flow"><span class="element">object</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       <a class="ref" href="param.html#param">param</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="object.elem.phrasing"><a class="hash" href="object.html#object.elem.phrasing"><span class="element">object</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
       <a class="ref" href="param.html#param">param</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
     </span></dd>
@@ -101,11 +101,7 @@
         <ul>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
-      </div>
-      <div class="no-number no-toc" id="object-display">
-        <h2 class="element-subhead">Typical default display properties <a class="hash" href="#object-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
-        <div class="css-props" id="object-css"><div class="selectors"><span class="selector">object</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">overflow</span>: <span class="prop-value">hidden</span>; }</div></div></div></div></div>
+      </div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="noscript.html">&#171; noscript</a></span>

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h4.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h4.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h4-content">#</a></h2>
         <div class="content-models" id="h4-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h4-mdl" href="h4.html#h4-mdl" class="element">h4</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h4.html#h4.attrs">h4.attrs</a>
     </span></p>

Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- header.html	29 Jun 2009 09:18:46 -0000	1.8
+++ header.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#header-content">#</a></h2>
         <div class="content-models" id="header-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="header-mdl" href="header.html#header-mdl" class="element">header</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="header.html#header.attrs">header.attrs</a>
     </span></p>

Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- b.html	29 Jun 2009 09:18:44 -0000	1.6
+++ b.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -24,7 +24,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#b-content">#</a></h2>
         <div class="content-models" id="b-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="b-mdl" href="b.html#b-mdl" class="element">b</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="b.html#b.attrs">b.attrs</a>
     </span></p>

Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- img.html	29 Jun 2009 09:18:47 -0000	1.7
+++ img.html	8 Jul 2009 10:31:01 -0000	1.8
@@ -45,7 +45,7 @@
         scripted.</dd>
           
             <dt><a class="attribute-name" id="img.attrs.alt" title="img.attrs.alt" href="img.html#img.attrs.alt">alt</a><span class="attr-values"> = 
-      <a href="syntax.html#character-data">character data</a>
+      <a href="syntax.html#normal-character-data">normal character data</a>
     </span> </dt>
             <dd>The <a href="terminology.html#fallback">fallback content</a> for the
         image.</dd>
@@ -110,11 +110,7 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#img-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
-      </div>
-      <div class="no-number no-toc" id="img-display">
-        <h2 class="element-subhead">Typical default display properties <a class="hash" href="#img-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
-        <div class="css-props" id="img-css"><div class="selectors"><span class="selector">img</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">overflow</span>: <span class="prop-value">hidden</span>; }</div></div></div></div></div>
+      </div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="iframe.html">&#171; iframe</a></span>

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bdo.html	29 Jun 2009 09:18:45 -0000	1.6
+++ bdo.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#bdo-content">#</a></h2>
         <div class="content-models" id="bdo-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="bdo-mdl" href="bdo.html#bdo-mdl" class="element">bdo</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a>
     </span></p>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- datatypes.html	29 Jun 2009 09:18:46 -0000	1.13
+++ datatypes.html	8 Jul 2009 10:31:01 -0000	1.14
@@ -17,7 +17,8 @@
     <h2>11.1. String <a class="hash" href="#data-string-def">#</a></h2>
     <p>For any pattern in this document that references the <a href="datatypes.html#data-string">string</a> datatype, a
     <dfn id="data-string" title="string">string</dfn>
-    is defined as <a href="syntax.html#character-data">character data</a>
+    is defined as
+    <a href="syntax.html#normal-character-data">normal character data</a>
     that does not contain any
     <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
     <p>The <a href="syntax.html#syntax-attributes">Attributes</a> section of

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- embed.html	29 Jun 2009 09:18:46 -0000	1.8
+++ embed.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -75,11 +75,7 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#embed-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
-      </div>
-      <div class="no-number no-toc" id="embed-display">
-        <h2 class="element-subhead">Typical default display properties <a class="hash" href="#embed-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
-        <div class="css-props" id="embed-css"><div class="selectors"><span class="selector">embed</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">overflow</span>: <span class="prop-value">hidden</span>; }</div></div></div></div></div>
+      </div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="em.html">&#171; em</a></span>

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dd.html	29 Jun 2009 09:18:46 -0000	1.6
+++ dd.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -29,7 +29,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dd-content">#</a></h2>
         <div class="content-models" id="dd-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dd-mdl" href="dd.html#dd-mdl" class="element">dd</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="dd.html#dd.attrs">dd.attrs</a>
     </span></p>

Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- strong.html	29 Jun 2009 09:18:49 -0000	1.6
+++ strong.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#strong-content">#</a></h2>
         <div class="content-models" id="strong-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="strong-mdl" href="strong.html#strong-mdl" class="element">strong</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="strong.html#strong.attrs">strong.attrs</a>
     </span></p>

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- li.html	29 Jun 2009 09:18:47 -0000	1.7
+++ li.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -22,19 +22,19 @@
         <dl class="content-models" id="li-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="li-pattern"><a class="hash" href="li.html#li-pattern"><span class="element">li</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="li.html#li.attrs">li.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="oli"><a class="hash" href="li.html#oli">o<span class="element">li</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="li.html#oli.attrs">oli.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="mli"><a class="hash" href="li.html#mli">m<span class="element">li</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="li.html#mli.attrs">mli.attrs</a>
     </span></dd>
@@ -72,7 +72,7 @@
         <li class="context-mdl"><a href="ul.html#ul-mdl">ul</a> = <a class="ref" href="li.html#li-pattern">li</a>*</li>
         <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a>*</li>
         <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a>*
-  | (<a href="syntax.html#character-data">character data</a>
+  | (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
       </div>
       <div class="no-number no-toc" id="li-display">

Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.html	29 Jun 2009 09:18:49 -0000	1.6
+++ style.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -23,13 +23,13 @@
         <dl class="content-models" id="style-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="style-pattern"><a class="hash" href="style.html#style-pattern"><span class="element">style</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
       &amp; <a class="ref" href="style.html#style.attrs">style.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="style.elem.scoped"><a class="hash" href="style.html#style.elem.scoped"><span class="element">style</span>.elem.scoped</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
       &amp; <a class="ref" href="style.html#style.scoped.attrs">style.scoped.attrs</a>
     </span></dd>
@@ -90,20 +90,20 @@
   | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
   | (<a class="ref" href="command.html#command">command</a>)</li>
         <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
    | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
    | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
    | <a class="ref" href="style.html#style-pattern">style</a>)*</li>
         <li class="context-mdl"><a href="section.html#section-mdl">section</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
       </div>
       <div class="no-number no-toc" id="style-display">

Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- caption.html	29 Jun 2009 09:18:45 -0000	1.6
+++ caption.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#caption-content">#</a></h2>
         <div class="content-models" id="caption-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="caption-mdl" href="caption.html#caption-mdl" class="element">caption</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="caption.html#caption.attrs">caption.attrs</a>
     </span></p>

Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- del.html	29 Jun 2009 09:18:46 -0000	1.9
+++ del.html	8 Jul 2009 10:31:01 -0000	1.10
@@ -23,13 +23,13 @@
         <dl class="content-models" id="del-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="del.elem.flow"><a class="hash" href="del.html#del.elem.flow"><span class="element">del</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="del.elem.phrasing"><a class="hash" href="del.html#del.elem.phrasing"><span class="element">del</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
     </span></dd>

Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- menu.html	29 Jun 2009 09:18:48 -0000	1.7
+++ menu.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -22,7 +22,7 @@
         <div class="content-models" id="menu-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="menu-mdl" href="menu.html#menu-mdl" class="element">menu</a> = </span><span>
       (<a class="ref" href="li.html#mli">li</a>*
-  | (<a href="syntax.html#character-data">character data</a>
+  | (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
       &amp; <a class="ref" href="menu.html#menu.attrs">menu.attrs</a>
     </span></p>

Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- code.html	29 Jun 2009 09:18:45 -0000	1.6
+++ code.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#code-content">#</a></h2>
         <div class="content-models" id="code-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="code-mdl" href="code.html#code-mdl" class="element">code</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="code.html#code.attrs">code.attrs</a>
     </span></p>

Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h2.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h2.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h2-content">#</a></h2>
         <div class="content-models" id="h2-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h2-mdl" href="h2.html#h2-mdl" class="element">h2</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h2.html#h2.attrs">h2.attrs</a>
     </span></p>

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- p.html	29 Jun 2009 09:18:48 -0000	1.7
+++ p.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#p-content">#</a></h2>
         <div class="content-models" id="p-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="p-mdl" href="p.html#p-mdl" class="element">p</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="p.html#p.attrs">p.attrs</a>
     </span></p>

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- map.html	29 Jun 2009 09:18:48 -0000	1.7
+++ map.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -23,13 +23,13 @@
         <dl class="content-models" id="map-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="map.html#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="map.elem.phrasing"><a class="hash" href="map.html#map.elem.phrasing"><span class="element">map</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
     </span></dd>

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- param.html	29 Jun 2009 09:18:48 -0000	1.7
+++ param.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -55,10 +55,10 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#param-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
       </div>
       <div class="no-number no-toc" id="param-display">

Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- span.html	29 Jun 2009 09:18:48 -0000	1.6
+++ span.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -28,7 +28,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#span-content">#</a></h2>
         <div class="content-models" id="span-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="span-mdl" href="span.html#span-mdl" class="element">span</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="span.html#span.attrs">span.attrs</a>
     </span></p>

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- q.html	29 Jun 2009 09:18:48 -0000	1.6
+++ q.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#q-content">#</a></h2>
         <div class="content-models" id="q-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="q-mdl" href="q.html#q-mdl" class="element">q</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="q.html#q.attrs">q.attrs</a>
     </span></p>

Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common-attributes.html	29 Jun 2009 09:18:45 -0000	1.7
+++ common-attributes.html	8 Jul 2009 10:31:01 -0000	1.8
@@ -51,7 +51,7 @@
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
             <dt><a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="common-attributes.html#common.attrs.title">title</a><span class="attr-values"> = 
-      <a href="syntax.html#character-data">character data</a>
+      <a href="syntax.html#normal-character-data">normal character data</a>
     </span> </dt>
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- option.html	29 Jun 2009 09:18:48 -0000	1.7
+++ option.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#option-content">#</a></h2>
         <div class="content-models" id="option-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="option.html#option-mdl" class="element">option</a> = </span><span>
-      character data
+      normal character data
       &amp; <a class="ref" href="option.html#option.attrs">option.attrs</a>
     </span></p>
         </div>
@@ -70,7 +70,7 @@
         <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a>*
   &amp; <a class="ref" href="option.html#option">option</a>*</li>
         <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a>*
-  &amp; (<a href="syntax.html#character-data">character data</a>
+  &amp; (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
       </div></div>
 <hr class="footerbreak"></hr>

Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- label.html	29 Jun 2009 09:18:47 -0000	1.6
+++ label.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#label-content">#</a></h2>
         <div class="content-models" id="label-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="label-mdl" href="label.html#label-mdl" class="element">label</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="label.html#label.attrs">label.attrs</a>
     </span></p>

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- noscript.html	29 Jun 2009 09:18:48 -0000	1.6
+++ noscript.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -32,13 +32,13 @@
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.phrasing"><a class="hash" href="noscript.html#noscript.elem.phrasing"><span class="element">noscript</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.flow"><a class="hash" href="noscript.html#noscript.elem.flow"><span class="element">noscript</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
     </span></dd>

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- blockquote.html	29 Jun 2009 09:18:45 -0000	1.6
+++ blockquote.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content">#</a></h2>
         <div class="content-models" id="blockquote-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="blockquote-mdl" href="blockquote.html#blockquote-mdl" class="element">blockquote</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a>
     </span></p>

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- td.html	29 Jun 2009 09:18:49 -0000	1.6
+++ td.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#td-content">#</a></h2>
         <div class="content-models" id="td-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="td-mdl" href="td.html#td-mdl" class="element">td</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="td.html#td.attrs">td.attrs</a>
     </span></p>

Index: em.html
===================================================================
RCS file: /sources/public/html5/markup/em.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- em.html	29 Jun 2009 09:18:46 -0000	1.6
+++ em.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#em-content">#</a></h2>
         <div class="content-models" id="em-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="em-mdl" href="em.html#em-mdl" class="element">em</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="em.html#em.attrs">em.attrs</a>
     </span></p>

Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/figure.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- figure.html	29 Jun 2009 09:18:46 -0000	1.6
+++ figure.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -24,9 +24,9 @@
         <div class="content-models" id="figure-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="figure-mdl" href="figure.html#figure-mdl" class="element">figure</a> = </span><span>
       (<a class="ref" href="legend.html#legend">legend</a>,
-   (<a href="syntax.html#character-data">character data</a>
+   (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a href="syntax.html#character-data">character data</a>
+  | ((<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
      <a class="ref" href="legend.html#legend">legend</a>?)
       &amp; <a class="ref" href="figure.html#figure.attrs">figure.attrs</a>

Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- style.css	10 Jun 2009 14:59:47 -0000	1.67
+++ style.css	8 Jul 2009 10:31:02 -0000	1.68
@@ -350,10 +350,14 @@
 }
 .note {
   font-style: italic;
-  margin: 10px;
-  margin-left: 20px;
+  padding: 10px;
+  border: 1px dashed gray;
   margin-right: 15%;
 }
+.note:before {
+  content: "Note: ";
+  font-weight: bold;
+}
 pre strong {
   background-color: yellow;
 }

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kbd.html	29 Jun 2009 09:18:47 -0000	1.6
+++ kbd.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#kbd-content">#</a></h2>
         <div class="content-models" id="kbd-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="kbd-mdl" href="kbd.html#kbd-mdl" class="element">kbd</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a>
     </span></p>

Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- canvas.html	29 Jun 2009 09:18:45 -0000	1.6
+++ canvas.html	8 Jul 2009 10:31:00 -0000	1.7
@@ -24,13 +24,13 @@
         <dl class="content-models" id="canvas-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="canvas.elem.flow"><a class="hash" href="canvas.html#canvas.elem.flow"><span class="element">canvas</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="canvas.elem.phrasing"><a class="hash" href="canvas.html#canvas.elem.phrasing"><span class="element">canvas</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
     </span></dd>

Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rt.html	29 Jun 2009 09:18:48 -0000	1.7
+++ rt.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#rt-content">#</a></h2>
         <div class="content-models" id="rt-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="rt-mdl" href="rt.html#rt-mdl" class="element">rt</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="rt.html#rt.attrs">rt.attrs</a>
     </span></p>
@@ -48,7 +48,7 @@
       <div class="no-number no-toc" id="rt-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#rt-context">#</a></h2>
         <ul>
-        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#character-data">character data</a>
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
     | (<a class="ref" href="rp.html#rp">rp</a>,

Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fieldset.html	29 Jun 2009 09:18:46 -0000	1.6
+++ fieldset.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -22,7 +22,7 @@
         <div class="content-models" id="fieldset-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="fieldset-mdl" href="fieldset.html#fieldset-mdl" class="element">fieldset</a> = </span><span>
       <a class="ref" href="legend.html#legend">legend</a>?,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a>
     </span></p>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- spec.html	1 Jul 2009 14:12:02 -0000	1.44
+++ spec.html	8 Jul 2009 10:31:02 -0000	1.45
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>1 July 2009</em>
+<h2>Editor&#8217;s Draft <em>8 July 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
[...1468 lines suppressed...]
     </span></dd>
@@ -13848,7 +13873,7 @@
           
             <dt>
 <a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="#common.attrs.title">title</a><span class="attr-values"> = 
-      <a href="#character-data">character data</a>
+      <a href="#normal-character-data">normal character data</a>
     </span> </dt>
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
@@ -14350,7 +14375,8 @@
 </h2>
     <p>For any pattern in this document that references the <a href="#data-string">string</a> datatype, a
     <dfn id="data-string" title="string">string</dfn>
-    is defined as <a href="#character-data">character data</a>
+    is defined as
+    <a href="#normal-character-data">normal character data</a>
     that does not contain any
     <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
     <p>The <a href="#syntax-attributes">Attributes</a> section of

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- datalist.html	29 Jun 2009 09:18:46 -0000	1.7
+++ datalist.html	8 Jul 2009 10:31:01 -0000	1.8
@@ -27,7 +27,7 @@
         <div class="content-models" id="datalist-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="datalist-mdl" href="datalist.html#datalist-mdl" class="element">datalist</a> = </span><span>
       <a class="ref" href="option.html#option">option</a>*
-  &amp; (<a href="syntax.html#character-data">character data</a>
+  &amp; (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a>
     </span></p>

Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h1.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h1.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h1-content">#</a></h2>
         <div class="content-models" id="h1-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h1-mdl" href="h1.html#h1-mdl" class="element">h1</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h1.html#h1.attrs">h1.attrs</a>
     </span></p>

Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h3.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h3.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h3-content">#</a></h2>
         <div class="content-models" id="h3-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h3-mdl" href="h3.html#h3-mdl" class="element">h3</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h3.html#h3.attrs">h3.attrs</a>
     </span></p>

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- button.button.html	29 Jun 2009 09:18:45 -0000	1.9
+++ button.button.html	8 Jul 2009 10:31:00 -0000	1.10
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.button-content">#</a></h2>
         <div class="content-models" id="button.button-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.button-mdl" href="button.button.html#button.button-mdl"><span class="element">button</span>.button</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a>
     </span></p>

Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- form.html	29 Jun 2009 09:18:46 -0000	1.6
+++ form.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#form-content">#</a></h2>
         <div class="content-models" id="form-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="form-mdl" href="form.html#form-mdl" class="element">form</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="form.html#form.attrs">form.attrs</a>
     </span></p>

Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- small.html	29 Jun 2009 09:18:48 -0000	1.6
+++ small.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#small-content">#</a></h2>
         <div class="content-models" id="small-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="small-mdl" href="small.html#small-mdl" class="element">small</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="small.html#small.attrs">small.attrs</a>
     </span></p>

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ruby.html	29 Jun 2009 09:18:48 -0000	1.7
+++ ruby.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#ruby-content">#</a></h2>
         <div class="content-models" id="ruby-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="ruby-mdl" href="ruby.html#ruby-mdl" class="element">ruby</a> = </span><span>
-      ((<a href="syntax.html#character-data">character data</a>
+      ((<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
     | (<a class="ref" href="rp.html#rp">rp</a>,

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- article.html	29 Jun 2009 09:18:44 -0000	1.10
+++ article.html	8 Jul 2009 10:31:00 -0000	1.11
@@ -24,7 +24,7 @@
         <div class="content-models" id="article-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="article-mdl" href="article.html#article-mdl" class="element">article</a> = </span><span>
       <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="article.html#article.attrs">article.attrs</a>
     </span></p>

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- video.html	29 Jun 2009 09:18:49 -0000	1.8
+++ video.html	8 Jul 2009 10:31:03 -0000	1.9
@@ -24,7 +24,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
     </span></dd>
@@ -32,7 +32,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
     </span></dd>

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- source.html	29 Jun 2009 09:18:48 -0000	1.9
+++ source.html	8 Jul 2009 10:31:02 -0000	1.10
@@ -75,19 +75,19 @@
         <ul>
         <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li>
         <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
       </div></div>
 <hr class="footerbreak"></hr>

Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- button.reset.html	29 Jun 2009 09:18:45 -0000	1.9
+++ button.reset.html	8 Jul 2009 10:31:00 -0000	1.10
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content">#</a></h2>
         <div class="content-models" id="button.reset-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.reset-mdl" href="button.reset.html#button.reset-mdl"><span class="element">button</span>.reset</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a>
     </span></p>

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- output.html	29 Jun 2009 09:18:48 -0000	1.6
+++ output.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#output-content">#</a></h2>
         <div class="content-models" id="output-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="output-mdl" href="output.html#output-mdl" class="element">output</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="output.html#output.attrs">output.attrs</a>
     </span></p>

Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- i.html	29 Jun 2009 09:18:46 -0000	1.6
+++ i.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#i-content">#</a></h2>
         <div class="content-models" id="i-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="i-mdl" href="i.html#i-mdl" class="element">i</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="i.html#i.attrs">i.attrs</a>
     </span></p>

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- var.html	29 Jun 2009 09:18:49 -0000	1.6
+++ var.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#var-content">#</a></h2>
         <div class="content-models" id="var-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="var-mdl" href="var.html#var-mdl" class="element">var</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="var.html#var.attrs">var.attrs</a>
     </span></p>

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sub.html	29 Jun 2009 09:18:49 -0000	1.6
+++ sub.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#sub-content">#</a></h2>
         <div class="content-models" id="sub-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="sub-mdl" href="sub.html#sub-mdl" class="element">sub</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="sub.html#sub.attrs">sub.attrs</a>
     </span></p>

Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- title.html	29 Jun 2009 09:18:49 -0000	1.6
+++ title.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#title-content">#</a></h2>
         <div class="content-models" id="title-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="title-mdl" href="title.html#title-mdl" class="element">title</a> = </span><span>
-      character data
+      normal character data
       &amp; <a class="ref" href="title.html#title.attrs">title.attrs</a>
     </span></p>
         </div>

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pre.html	29 Jun 2009 09:18:48 -0000	1.6
+++ pre.html	8 Jul 2009 10:31:02 -0000	1.7
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#pre-content">#</a></h2>
         <div class="content-models" id="pre-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="pre-mdl" href="pre.html#pre-mdl" class="element">pre</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="pre.html#pre.attrs">pre.attrs</a>
     </span></p>

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- button.submit.html	29 Jun 2009 09:18:45 -0000	1.9
+++ button.submit.html	8 Jul 2009 10:31:00 -0000	1.10
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content">#</a></h2>
         <div class="content-models" id="button.submit-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.submit-mdl" href="button.submit.html#button.submit-mdl"><span class="element">button</span>.submit</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a>
     </span></p>

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rp.html	29 Jun 2009 09:18:48 -0000	1.7
+++ rp.html	8 Jul 2009 10:31:02 -0000	1.8
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#rp-content">#</a></h2>
         <div class="content-models" id="rp-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
     </span></p>
@@ -50,7 +50,7 @@
       <div class="no-number no-toc" id="rp-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#rp-context">#</a></h2>
         <ul>
-        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#character-data">character data</a>
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
     | (<a class="ref" href="rp.html#rp">rp</a>,

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sup.html	29 Jun 2009 09:18:49 -0000	1.6
+++ sup.html	8 Jul 2009 10:31:03 -0000	1.7
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#sup-content">#</a></h2>
         <div class="content-models" id="sup-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="sup-mdl" href="sup.html#sup-mdl" class="element">sup</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="sup.html#sup.attrs">sup.attrs</a>
     </span></p>

Index: details.html
===================================================================
RCS file: /sources/public/html5/markup/details.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- details.html	29 Jun 2009 09:18:46 -0000	1.6
+++ details.html	8 Jul 2009 10:31:01 -0000	1.7
@@ -23,7 +23,7 @@
         <div class="content-models" id="details-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="details-mdl" href="details.html#details-mdl" class="element">details</a> = </span><span>
       <a class="ref" href="legend.html#legend">legend</a>,
-  (<a href="syntax.html#character-data">character data</a>
+  (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="details.html#details.attrs">details.attrs</a>
     </span></p>

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- h5.html	29 Jun 2009 09:18:46 -0000	1.8
+++ h5.html	8 Jul 2009 10:31:01 -0000	1.9
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h5-content">#</a></h2>
         <div class="content-models" id="h5-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h5-mdl" href="h5.html#h5-mdl" class="element">h5</a> = </span><span>
-      (<a href="syntax.html#character-data">character data</a>
+      (<a href="syntax.html#normal-character-data">normal character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="h5.html#h5.attrs">h5.attrs</a>
     </span></p>
Received on Wednesday, 8 July 2009 10:32:21 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:07 GMT