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

h:tml; introduce the term "character data", and link to it from content models

From: poot <cvsmail@w3.org>
Date: Sat, 27 Jun 2009 00:54:14 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090626155414.EAE242BC00@toro.w3.mag.keio.ac.jp>
h:tml; introduce the term "character data", and link to it from content
models

http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.41&r2=1.42&f=h

===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- body.html	3 May 2009 15:59:40 -0000	1.4
+++ body.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- legend.html	3 May 2009 15:59:42 -0000	1.4
+++ legend.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>,
-   (text
+   (<a href="terminology.html#character-data">character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((text
+  | ((<a href="terminology.html#character-data">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>?,
-  (text
+  (<a href="terminology.html#character-data">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>,
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- address.html	3 May 2009 15:59:39 -0000	1.4
+++ address.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- th.html	3 May 2009 15:59:43 -0000	1.4
+++ th.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bb.html	3 May 2009 15:59:40 -0000	1.4
+++ bb.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mark.html	3 May 2009 15:59:42 -0000	1.4
+++ mark.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- iframe.html	8 Jun 2009 00:53:37 -0000	1.5
+++ iframe.html	26 Jun 2009 15:52:52 -0000	1.6
@@ -21,7 +21,8 @@
         <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>
-      text &amp; <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
+      character data
+      &amp; <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="iframe-attr-mdl">

Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- datagrid.html	24 Jun 2009 17:36:49 -0000	1.7
+++ datagrid.html	26 Jun 2009 15:52:52 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ins.html	15 Jun 2009 13:20:24 -0000	1.7
+++ ins.html	26 Jun 2009 15:52:53 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- abbr.html	3 May 2009 15:59:39 -0000	1.4
+++ abbr.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- div.html	3 May 2009 15:59:40 -0000	1.4
+++ div.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dt.html	3 May 2009 15:59:40 -0000	1.4
+++ dt.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nav.html	3 May 2009 15:59:42 -0000	1.6
+++ nav.html	26 Jun 2009 15:52:53 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- footer.html	3 May 2009 15:59:41 -0000	1.6
+++ footer.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- script.html	5 Jun 2009 10:18:01 -0000	1.5
+++ script.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- audio.html	26 Jun 2009 09:05:26 -0000	1.6
+++ audio.html	26 Jun 2009 15:52:51 -0000	1.7
@@ -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>*),
-  (text
+  (<a href="terminology.html#character-data">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>*),
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- time.html	3 May 2009 15:59:43 -0000	1.4
+++ time.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- progress.html	3 May 2009 15:59:42 -0000	1.4
+++ progress.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dfn.html	3 May 2009 15:59:40 -0000	1.4
+++ dfn.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- textarea.html	3 May 2009 15:59:43 -0000	1.4
+++ textarea.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      text
+      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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cite.html	3 May 2009 15:59:40 -0000	1.4
+++ cite.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- meter.html	3 May 2009 15:59:42 -0000	1.4
+++ meter.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- aside.html	3 May 2009 15:59:39 -0000	1.6
+++ aside.html	26 Jun 2009 15:52:51 -0000	1.7
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syntax.html	13 Jun 2009 09:12:01 -0000	1.8
+++ syntax.html	26 Jun 2009 15:52:54 -0000	1.9
@@ -531,14 +531,12 @@
       <a href="references.html#refsXML">[XML]</a>.</li>
 
       <li>
-      <dfn id="attribute-value" title="syntax-attribute-value">Attribute values</dfn> are
-      a mixture of
-      <a href="syntax.html#syntax-text" title="syntax-text">text</a>
-      and
-      <a href="syntax.html#syntax-charref">character references</a>, except
-      with the additional restriction that the text
-      cannot contain an
-      <a href="syntax.html#ambiguous" title="syntax-ambiguous-ampersand">ambiguous ampersand</a>.</li>
+      <dfn id="attribute-value" title="syntax-attribute-value">Attribute values</dfn>, in
+      general, are
+      <a href="terminology.html#character-data">character data</a>,
+      with the additional restriction that they must not
+      contain any
+      <a href=".html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</li>
     </ul>
 
     <p>In the <a href="syntax.html#html-syntax">the HTML syntax</a>,
@@ -573,7 +571,7 @@
           separating the two.</p>
         </dd>
 
-        <dt><dfn id="syntax-attr-unquoted" title="syntax-attributes-unquoted">Unquoted attribute-value syntax</dfn></dt>
+        <dt><dfn id="syntax-attr-unquoted" title="syntax-attr-unquoted">Unquoted attribute-value syntax</dfn></dt>
         <dd>
         <p>An attribute and its value may be specified by providing
           the <a href="syntax.html#attribute-name" title="syntax-attribute-name">attribute name</a>,
@@ -586,8 +584,9 @@
           <a href="syntax.html#attribute-value" title="syntax-attribute-value">attribute value</a>.</p>
 
           <p>In addition to the general requirements given above for
-          attribute values, an unquoted attribute value must not
-          contain any literal
+          attribute values, an 
+          <dfn id="attr-value-unquoted" title="attr-value-unquoted">unquoted attribute value</dfn>
+          must not contain any literal
           <a href="terminology.html#space" title="space character">space characters</a>,
           any U+0022 QUOTATION MARK (<code>"</code>) characters,
           U+0027 APOSTROPHE (<code>'</code>) characters, U+003D
@@ -631,7 +630,8 @@
           APOSTROPHE (<code>'</code>) character.</p>
 
           <p>In addition to the general requirements given above
-          for attribute values, single-quoted attribute values
+          for attribute values, a
+          <dfn id="attr-value-single-quoted" title="attr-value-single-quoted">single-quoted attribute value</dfn>
           must not contain any literal U+0027
           APOSTROPHE (<code>'</code>) characters.</p>
 
@@ -667,7 +667,9 @@
           MARK (<code>"</code>) character.</p>
 
           <p>In addition to the general requirements given above for
-          attribute values, double-quoted attribute values must not
+          attribute values, an
+          <dfn id="attr-value-double-quoted" title="attr-value-double-quoted">double-quoted attribute value</dfn>
+          must not
           contain any literal U+0022 QUOTATION MARK (<code>"</code>)
           characters.</p>
 

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- section.html	15 Jun 2009 05:57:15 -0000	1.8
+++ section.html	26 Jun 2009 15:52:53 -0000	1.9
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- area.html	3 May 2009 15:59:39 -0000	1.4
+++ area.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -50,7 +50,9 @@
       <div class="no-number no-toc" id="area-attributes">
         <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"> =  text </span> </dt>
+            <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="terminology.html#character-data">character data</a>
+    </span> </dt>
             <dd>The text of the hyperlink.</dd>
           
             <dt><a class="attribute-name" id="area.attrs.shape.rect" title="area.attrs.shape.rect" href="area.html#area.attrs.shape.rect">shape<span class="attr-qualifier">.rect</span></a><span class="attr-values"> =   "rect" </span><span class="punc"> &amp; </span><a class="attribute-name" id="area.attrs.coords.rect" title="area.attrs.coords.rect" href="area.html#area.attrs.coords.rect">coords<span class="attr-qualifier">.rect</span></a><span class="attr-values"> =  d:rectangle </span></dt>

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- samp.html	3 May 2009 15:59:43 -0000	1.4
+++ samp.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h6.html	3 May 2009 15:59:41 -0000	1.6
+++ h6.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a.html	3 May 2009 15:59:39 -0000	1.4
+++ a.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object.html	7 Jun 2009 23:07:54 -0000	1.6
+++ object.html	26 Jun 2009 15:52:53 -0000	1.7
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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>

Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- terminology.html	8 Jun 2009 00:53:37 -0000	1.7
+++ terminology.html	26 Jun 2009 15:52:54 -0000	1.8
@@ -36,6 +36,16 @@
       LETTER Z). Many strings in the HTML syntax (for example, the
       names of elements and their attributes) are <a href="terminology.html#case-insensitive">case-insensitive</a>.
     </dd>
+    <dt><dfn id="character-data">character data</dfn></dt>
+    <dd>For <a href="syntax.html#syntax-document-html">documents in the HTML
+        syntax</a>, <a href="terminology.html#character-data">character data</a>
+      is defined as any mixture of
+      <a href="syntax.html#syntax-text" title="syntax-text">text</a>
+      and
+      <a href="syntax.html#syntax-charref">character references</a>.</dd>
+    <dd>For <a href="syntax.html#syntax-document-xml">documents in the XML
+        syntax</a>, <a href="terminology.html#character-data">character data</a>
+      is as defined in the XML specification <a href="references.html#refsXML">[XML]</a>.</dd>
     <dt><dfn id="fallback">fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the external resource cannot

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h4.html	3 May 2009 15:59:41 -0000	1.6
+++ h4.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- header.html	3 May 2009 15:59:41 -0000	1.6
+++ header.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- b.html	3 May 2009 15:59:39 -0000	1.4
+++ b.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- img.html	7 Jun 2009 23:07:54 -0000	1.5
+++ img.html	26 Jun 2009 15:52:52 -0000	1.6
@@ -44,7 +44,9 @@
         animated, image resource that is neither paged nor
         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"> =  text </span> </dt>
+            <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="terminology.html#character-data">character data</a>
+    </span> </dt>
             <dd>The <a href="terminology.html#fallback">fallback content</a> for the
         image.</dd>
           

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bdo.html	3 May 2009 15:59:40 -0000	1.4
+++ bdo.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- datatypes.html	16 Jun 2009 10:19:39 -0000	1.11
+++ datatypes.html	26 Jun 2009 15:52:52 -0000	1.12
@@ -17,12 +17,17 @@
     <h2>10.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 any mixture of
-    <a href="syntax.html#syntax-text">text</a>
-    and
-    <a href="syntax.html#syntax-charref">character references</a>
-    that does not contain an
-    <a href="syntax.html#ambiguous">ambiguous ampersand</a>.</p>
+    is defined as <a href="terminology.html#character-data">character data</a>
+    that does not contain any
+    <a href=".html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <p>The <a href=".html#syntax">Syntax</a> section of this document
+    describes additional restrictions on strings in attribute
+    values &#8212; in particular, restrictions for the following cases:</p>
+    <ul>
+      <li><a href="syntax.html#attr-value-unquoted">unquoted attribute values</a></li>
+      <li><a href="syntax.html#attr-value-single-quoted">single-quoted attribute values</a></li>
+      <li><a href="syntax.html#attr-value-double-quoted">double-quoted attribute values</a></li>
+    </ul>
   </div><div id="data-token-def" class="section">
     <h2>10.2. Token <a class="hash" href="#data-token-def">#</a></h2>
     <p>For any pattern in this document that references the <a href="datatypes.html#data-token">token</a> datatype, a

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dd.html	3 May 2009 15:59:40 -0000	1.4
+++ dd.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- strong.html	3 May 2009 15:59:43 -0000	1.4
+++ strong.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- li.html	15 Jun 2009 17:16:10 -0000	1.5
+++ li.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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>*
-  | (text
+  | (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.html	3 May 2009 15:59:43 -0000	1.4
+++ style.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- caption.html	3 May 2009 15:59:40 -0000	1.4
+++ caption.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- del.html	15 Jun 2009 13:20:24 -0000	1.7
+++ del.html	26 Jun 2009 15:52:52 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- menu.html	16 Jun 2009 18:44:26 -0000	1.5
+++ menu.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>*
-  | (text
+  | (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- code.html	3 May 2009 15:59:40 -0000	1.4
+++ code.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h2.html	3 May 2009 15:59:41 -0000	1.6
+++ h2.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- p.html	5 Jun 2009 10:18:01 -0000	1.5
+++ p.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- map.html	30 May 2009 11:38:55 -0000	1.5
+++ map.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- param.html	16 Jun 2009 18:44:27 -0000	1.5
+++ param.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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>*,
-  (text
+  (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- span.html	3 May 2009 15:59:43 -0000	1.4
+++ span.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- q.html	3 May 2009 15:59:42 -0000	1.4
+++ q.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- common-attributes.html	16 Jun 2009 18:44:26 -0000	1.5
+++ common-attributes.html	26 Jun 2009 15:52:52 -0000	1.6
@@ -50,7 +50,9 @@
     </span> </dt>
             <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"> =  text </span> </dt>
+            <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="terminology.html#character-data">character data</a>
+    </span> </dt>
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
             <dt><a class="attribute-name" id="common.attrs.xmlbase" title="common.attrs.xmlbase" href="common-attributes.html#common.attrs.xmlbase">xml:base</a><span class="attr-values"> = 

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- option.html	16 Jun 2009 18:44:27 -0000	1.5
+++ option.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -23,7 +23,8 @@
         <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>
-      text &amp; <a class="ref" href="option.html#option.attrs">option.attrs</a>
+      character data
+      &amp; <a class="ref" href="option.html#option.attrs">option.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="option-attr-mdl">
@@ -69,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; (text
+  &amp; (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- label.html	3 May 2009 15:59:42 -0000	1.4
+++ label.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- noscript.html	3 May 2009 15:59:42 -0000	1.4
+++ noscript.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- blockquote.html	3 May 2009 15:59:40 -0000	1.4
+++ blockquote.html	26 Jun 2009 15:52:51 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- td.html	3 May 2009 15:59:43 -0000	1.4
+++ td.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- em.html	3 May 2009 15:59:40 -0000	1.4
+++ em.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- figure.html	3 May 2009 15:59:41 -0000	1.4
+++ figure.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>,
-   (text
+   (<a href="terminology.html#character-data">character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((text
+  | ((<a href="terminology.html#character-data">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: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kbd.html	3 May 2009 15:59:42 -0000	1.4
+++ kbd.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- canvas.html	3 May 2009 15:59:40 -0000	1.4
+++ canvas.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rt.html	10 Jun 2009 11:05:46 -0000	1.5
+++ rt.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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> = ((text
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fieldset.html	3 May 2009 15:59:40 -0000	1.4
+++ fieldset.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>?,
-  (text
+  (<a href="terminology.html#character-data">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.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- spec.html	26 Jun 2009 09:05:27 -0000	1.41
+++ spec.html	26 Jun 2009 15:52:53 -0000	1.42
@@ -760,6 +760,16 @@
       LETTER Z). Many strings in the HTML syntax (for example, the
       names of elements and their attributes) are <a href="#case-insensitive">case-insensitive</a>.
     </dd>
+    <dt><dfn id="character-data">character data</dfn></dt>
+    <dd>For <a href="#syntax-document-html">documents in the HTML
+        syntax</a>, <a href="#character-data">character data</a>
+      is defined as any mixture of
+      <a href="#syntax-text" title="syntax-text">text</a>
+      and
+      <a href="#syntax-charref">character references</a>.</dd>
+    <dd>For <a href="#syntax-document-xml">documents in the XML
[...1023 lines suppressed...]
-    and
-    <a href="#syntax-charref">character references</a>
-    that does not contain an
-    <a href="#ambiguous">ambiguous ampersand</a>.</p>
-  </div>
+    is defined as <a href="#character-data">character data</a>
+    that does not contain any
+    <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <p>The <a href="#syntax">Syntax</a> section of this document
+    describes additional restrictions on strings in attribute
+    values &#8212; in particular, restrictions for the following cases:</p>
+    <ul>
+<li><a href="#attr-value-unquoted">unquoted attribute values</a></li>
+      <li><a href="#attr-value-single-quoted">single-quoted attribute values</a></li>
+      <li><a href="#attr-value-double-quoted">double-quoted attribute values</a></li>
+    </ul>
+</div>
 <div id="data-token-def" class="section">
     <h2>10.2. Token <a class="hash" href="#data-token-def">#</a>
 </h2>

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- datalist.html	3 Jun 2009 10:12:57 -0000	1.5
+++ datalist.html	26 Jun 2009 15:52:52 -0000	1.6
@@ -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; (text
+  &amp; (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h1.html	3 May 2009 15:59:41 -0000	1.6
+++ h1.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h3.html	3 May 2009 15:59:41 -0000	1.6
+++ h3.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- button.button.html	16 Jun 2009 18:44:26 -0000	1.7
+++ button.button.html	26 Jun 2009 15:52:52 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- form.html	3 May 2009 15:59:41 -0000	1.4
+++ form.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- small.html	3 May 2009 15:59:43 -0000	1.4
+++ small.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ruby.html	10 Jun 2009 11:05:46 -0000	1.5
+++ ruby.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      ((text
+      ((<a href="terminology.html#character-data">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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- article.html	15 Jun 2009 05:57:15 -0000	1.8
+++ article.html	26 Jun 2009 15:52:51 -0000	1.9
@@ -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>*,
-  (text
+  (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- video.html	26 Jun 2009 09:05:27 -0000	1.6
+++ video.html	26 Jun 2009 15:52:54 -0000	1.7
@@ -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>*),
-  (text
+  (<a href="terminology.html#character-data">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>*),
-  (text
+  (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- source.html	26 Jun 2009 09:05:27 -0000	1.7
+++ source.html	26 Jun 2009 15:52:53 -0000	1.8
@@ -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>*),
-  (text
+  (<a href="terminology.html#character-data">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>*),
-  (text
+  (<a href="terminology.html#character-data">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>*),
-  (text
+  (<a href="terminology.html#character-data">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>*),
-  (text
+  (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- button.reset.html	16 Jun 2009 18:44:26 -0000	1.7
+++ button.reset.html	26 Jun 2009 15:52:52 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- output.html	3 May 2009 15:59:42 -0000	1.4
+++ output.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i.html	3 May 2009 15:59:41 -0000	1.4
+++ i.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- var.html	3 May 2009 15:59:43 -0000	1.4
+++ var.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sub.html	3 May 2009 15:59:43 -0000	1.4
+++ sub.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- title.html	3 May 2009 15:59:43 -0000	1.4
+++ title.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -21,7 +21,8 @@
         <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>
-      text &amp; <a class="ref" href="title.html#title.attrs">title.attrs</a>
+      character data
+      &amp; <a class="ref" href="title.html#title.attrs">title.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="title-attr-mdl">

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pre.html	3 May 2009 15:59:42 -0000	1.4
+++ pre.html	26 Jun 2009 15:52:53 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- button.submit.html	16 Jun 2009 18:44:26 -0000	1.7
+++ button.submit.html	26 Jun 2009 15:52:52 -0000	1.8
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rp.html	10 Jun 2009 11:05:46 -0000	1.5
+++ rp.html	26 Jun 2009 15:52:53 -0000	1.6
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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> = ((text
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sup.html	3 May 2009 15:59:43 -0000	1.4
+++ sup.html	26 Jun 2009 15:52:54 -0000	1.5
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- details.html	3 May 2009 15:59:40 -0000	1.4
+++ details.html	26 Jun 2009 15:52:52 -0000	1.5
@@ -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>,
-  (text
+  (<a href="terminology.html#character-data">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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- h5.html	3 May 2009 15:59:41 -0000	1.6
+++ h5.html	26 Jun 2009 15:52:52 -0000	1.7
@@ -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>
-      (text
+      (<a href="terminology.html#character-data">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 Friday, 26 June 2009 15:55:00 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 20:08:57 UTC