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

h:tml; did substantial reorganizing and refining to the Syntax section; introduce the terms "replaceable character data" and "non-replaceable character data"

From: poot <cvsmail@w3.org>
Date: Mon, 29 Jun 2009 18:22:30 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090629092230.6C8432BBF3@toro.w3.mag.keio.ac.jp>
h:tml; did substantial reorganizing and refining to the Syntax section;
introduce the terms "replaceable character data" and "non-replaceable
character data"

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

===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- body.html	26 Jun 2009 15:52:52 -0000	1.5
+++ body.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>body &#8211; document body</title>
+<title>HTML5: body &#8211; document body</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#body-content">#</a></h2>
         <div class="content-models" id="body-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="body-mdl" href="body.html#body-mdl" class="element">body</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- legend.html	26 Jun 2009 15:52:53 -0000	1.5
+++ legend.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>legend &#8211; title or explanatory caption</title>
+<title>HTML5: legend &#8211; title or explanatory caption</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#legend-content">#</a></h2>
         <div class="content-models" id="legend-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="legend-mdl" href="legend.html#legend-mdl" class="element">legend</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>,
-   (<a href="terminology.html#character-data">character data</a>
+   (<a href="syntax.html#character-data">character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a href="terminology.html#character-data">character data</a>
+  | ((<a href="syntax.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>?,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- address.html	26 Jun 2009 15:52:51 -0000	1.5
+++ address.html	29 Jun 2009 09:18:44 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>address &#8211; contact information</title>
+<title>HTML5: address &#8211; contact information</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -25,7 +25,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#address-content">#</a></h2>
         <div class="content-models" id="address-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="address-mdl" href="address.html#address-mdl" class="element">address</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: button.html
===================================================================
RCS file: /sources/public/html5/markup/button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.html	3 May 2009 15:59:40 -0000	1.4
+++ button.html	29 Jun 2009 09:18:45 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>button</title>
+<title>HTML5: button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- th.html	26 Jun 2009 15:52:54 -0000	1.5
+++ th.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>th &#8211; table header cell</title>
+<title>HTML5: th &#8211; table header cell</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#th-content">#</a></h2>
         <div class="content-models" id="th-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="th-mdl" href="th.html#th-mdl" class="element">th</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bb.html	26 Jun 2009 15:52:51 -0000	1.5
+++ bb.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>bb &#8211; user-agent command</title>
+<title>HTML5: bb &#8211; user-agent command</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#bb-content">#</a></h2>
         <div class="content-models" id="bb-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="bb-mdl" href="bb.html#bb-mdl" class="element">bb</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mark.html	26 Jun 2009 15:52:53 -0000	1.5
+++ mark.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>mark &#8211; marked (highlighted) text</title>
+<title>HTML5: mark &#8211; marked (highlighted) text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#mark-content">#</a></h2>
         <div class="content-models" id="mark-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="mark-mdl" href="mark.html#mark-mdl" class="element">mark</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- Overview.html	26 Jun 2009 09:05:25 -0000	1.319
+++ Overview.html	29 Jun 2009 09:18:43 -0000	1.320
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>26 June 2009</em>
+<h2>Editor&#8217;s Draft <em>29 June 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 26 June 2009 Editor&#8217;s Draft of 
+        This document is the 29 June 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -97,22 +97,25 @@
 <a href="terminology.html#terminology">4. Terminology</a>
 </li>
 <li>
-<a href="syntax.html#syntax">5. Syntax</a>
+<a href="html-and-xhtml.html#html-and-xhtml">5. HTML and XHTML documents</a>
 </li>
 <li>
-<a href="elements.html#elements">6. HTML elements</a>
+<a href="syntax.html#syntax">6. HTML syntax</a>
 </li>
 <li>
-<a href="common-models.html#common-models">7. Common content models</a>
+<a href="elements.html#elements">7. Elements</a>
 </li>
 <li>
-<a href="common-attributes.html#common-attributes">8. Common attributes</a>
+<a href="common-models.html#common-models">8. Common content models</a>
 </li>
 <li>
-<a href="shared-attributes.html#shared-attributes">9. Other shared attributes</a>
+<a href="common-attributes.html#common-attributes">9. Common attributes</a>
 </li>
 <li>
-<a href="datatypes.html#datatypes">10. Datatypes</a>
+<a href="shared-attributes.html#shared-attributes">10. Other shared attributes</a>
+</li>
+<li>
+<a href="datatypes.html#datatypes">11. Datatypes</a>
 </li>
 </ul>
 <ul>
@@ -152,43 +155,54 @@
 <li id="terminology-toc">
 <a href="terminology.html#terminology">4. Terminology</a>
 </li>
-<li id="syntax-toc">
-<a href="syntax.html#syntax">5. Syntax</a>
+<li id="html-and-xhtml-toc">
+<a href="html-and-xhtml.html#html-and-xhtml">5. HTML and XHTML documents</a>
 <ul>
 <li id="mime-types-toc">
-<a href="syntax.html#mime-types">5.1. The HTML and XML syntaxes and MIME types</a>
+<a href="html-and-xhtml.html#mime-types">5.1. The HTML and XML syntaxes and MIME types</a>
 </li>
 <li id="documents-toc">
-<a href="syntax.html#documents">5.2. Conformant documents</a>
+<a href="html-and-xhtml.html#documents">5.2. Conformant documents</a>
 </li>
-<li id="the-doctype-toc">
-<a href="syntax.html#the-doctype">5.3. The DOCTYPE</a>
+</ul>
+</li>
+<li id="syntax-toc">
+<a href="syntax.html#syntax">6. HTML syntax</a>
+<ul>
+<li id="doctype-syntax-toc">
+<a href="syntax.html#doctype-syntax">6.1. The DOCTYPE</a>
 </li>
 <li id="character-encoding-toc">
-<a href="syntax.html#character-encoding">5.4. Character encoding declaration</a>
+<a href="syntax.html#character-encoding">6.2. Character encoding declaration</a>
 </li>
 <li id="syntax-elements-toc">
-<a href="syntax.html#syntax-elements">5.5. Elements</a>
+<a href="syntax.html#syntax-elements">6.3. Elements</a>
 </li>
 <li id="syntax-attributes-toc">
-<a href="syntax.html#syntax-attributes">5.6. Attributes</a>
+<a href="syntax.html#syntax-attributes">6.4. Attributes</a>
 </li>
 <li id="text-syntax-toc">
-<a href="syntax.html#text-syntax">5.7. Text</a>
-</li>
-<li id="character-toc">
-<a href="syntax.html#character">5.8. Character references</a>
+<a href="syntax.html#text-syntax">6.5. Text and character data</a>
 </li>
-<li id="cdata-toc">
-<a href="syntax.html#cdata">5.9. CDATA sections</a>
+<li id="character-references-toc">
+<a href="syntax.html#character-references">6.6. Character references</a>
 </li>
 <li id="comments-toc">
-<a href="syntax.html#comments">5.10. Comments</a>
+<a href="syntax.html#comments">6.7. Comments</a>
+</li>
+<li id="escaping-text-span-toc">
+<a href="syntax.html#escaping-text-span">6.8. Escaping text spans</a>
+</li>
+<li id="svg-mathml-toc">
+<a href="syntax.html#svg-mathml">6.9. SVG and MathML elements in HTML documents</a>
+</li>
+<li id="cdata-sections-toc">
+<a href="syntax.html#cdata-sections">6.10. CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </li>
 <li id="elements-toc">
-<a href="elements.html#elements">6. HTML elements</a>
+<a href="elements.html#elements">7. Elements</a>
 <ul>
 <li id="a-toc">
 <a href="a.html#a"><span class="element">a</span> &#8211; <span class="shortdesc">hyperlink</span></a>
@@ -607,55 +621,55 @@
 </ul>
 </li>
 <li id="common-models-toc">
-<a href="common-models.html#common-models">7. Common content models</a>
+<a href="common-models.html#common-models">8. Common content models</a>
 <ul>
 <li id="common-anything-toc">
-<a href="common-models.html#common-anything">7.1. Any element from any namespace</a>
+<a href="common-models.html#common-anything">8.1. Any element from any namespace</a>
 </li>
 <li id="common-flow-toc">
-<a href="common-models.html#common-flow">7.2. Flow elements</a>
+<a href="common-models.html#common-flow">8.2. Flow elements</a>
 </li>
 <li id="common-metadata-toc">
-<a href="common-models.html#common-metadata">7.3. Metadata elements</a>
+<a href="common-models.html#common-metadata">8.3. Metadata elements</a>
 </li>
 <li id="common-phrasing-toc">
-<a href="common-models.html#common-phrasing">7.4. Phrasing elements</a>
+<a href="common-models.html#common-phrasing">8.4. Phrasing elements</a>
 </li>
 </ul>
 </li>
 <li id="common-attributes-toc">
-<a href="common-attributes.html#common-attributes">8. Common attributes</a>
+<a href="common-attributes.html#common-attributes">9. Common attributes</a>
 <ul>
 <li id="basic-attrs-toc">
-<a href="common-attributes.html#basic-attrs">8.1. Basic attributes</a>
+<a href="common-attributes.html#basic-attrs">9.1. Basic attributes</a>
 </li>
 <li id="i18n-attrs-toc">
-<a href="common-attributes.html#i18n-attrs">8.2. Internationalization attributes</a>
+<a href="common-attributes.html#i18n-attrs">9.2. Internationalization attributes</a>
 </li>
 <li id="present-attrs-toc">
-<a href="common-attributes.html#present-attrs">8.3. Present attributes</a>
+<a href="common-attributes.html#present-attrs">9.3. Present attributes</a>
 </li>
 <li id="common.attrs.scripting-attrs-toc">
-<a href="common-attributes.html#common.attrs.scripting-attrs">8.4. Scripting attributes</a>
+<a href="common-attributes.html#common.attrs.scripting-attrs">9.4. Scripting attributes</a>
 </li>
 <li id="common.attrs.interact-attrs-toc">
-<a href="common-attributes.html#common.attrs.interact-attrs">8.5. Interaction attributes</a>
+<a href="common-attributes.html#common.attrs.interact-attrs">9.5. Interaction attributes</a>
 </li>
 </ul>
 </li>
 <li id="shared-attributes-toc">
-<a href="shared-attributes.html#shared-attributes">9. Other shared attributes</a>
+<a href="shared-attributes.html#shared-attributes">10. Other shared attributes</a>
 <ul>
 <li id="shared-hyperlink-attrs-toc">
-<a href="shared-attributes.html#shared-hyperlink-attrs">9.1. Hyperlink attributes</a>
+<a href="shared-attributes.html#shared-hyperlink-attrs">10.1. Hyperlink attributes</a>
 </li>
 <li id="common-form-attrs-toc">
-<a href="shared-attributes.html#common-form-attrs">9.2. Form attributes</a>
+<a href="shared-attributes.html#common-form-attrs">10.2. Form attributes</a>
 </li>
 </ul>
 </li>
 <li id="datatypes-toc">
-<a href="datatypes.html#datatypes">10. Datatypes</a>
+<a href="datatypes.html#datatypes">11. Datatypes</a>
 </li>
 </ul>
 <ul>
@@ -673,6 +687,7 @@
       
       
     
+    
         
     
     

Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- br.html	3 May 2009 15:59:40 -0000	1.4
+++ br.html	29 Jun 2009 09:18:45 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>br &#8211; line break</title>
+<title>HTML5: br &#8211; line break</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.email.html
===================================================================
RCS file: /sources/public/html5/markup/input.email.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.email.html	3 May 2009 15:59:41 -0000	1.4
+++ input.email.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=email &#8211; e-mail address input control</title>
+<title>HTML5: input type=email &#8211; e-mail address input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tr.html	3 May 2009 15:59:43 -0000	1.4
+++ tr.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>tr &#8211; table row</title>
+<title>HTML5: tr &#8211; table row</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/input.month.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.month.html	3 May 2009 15:59:41 -0000	1.4
+++ input.month.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=month &#8211; year-and-month input control</title>
+<title>HTML5: input type=month &#8211; year-and-month input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- iframe.html	26 Jun 2009 15:52:52 -0000	1.6
+++ iframe.html	29 Jun 2009 09:18:47 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>iframe &#8211; nested browsing context (inline frame)</title>
+<title>HTML5: iframe &#8211; nested browsing context (inline frame)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- datagrid.html	26 Jun 2009 15:52:52 -0000	1.8
+++ datagrid.html	29 Jun 2009 09:18:45 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>datagrid &#8211; datagrid</title>
+<title>HTML5: datagrid &#8211; datagrid</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#datagrid-content">#</a></h2>
         <div class="content-models" id="datagrid-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="datagrid.html#datagrid-mdl" class="element">datagrid</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ins.html	26 Jun 2009 15:52:53 -0000	1.8
+++ ins.html	29 Jun 2009 09:18:47 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>ins &#8211; inserted text</title>
+<title>HTML5: ins &#8211; inserted text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,13 +23,13 @@
         <dl class="content-models" id="ins-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="ins.elem.flow"><a class="hash" href="ins.html#ins.elem.flow"><span class="element">ins</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- abbr.html	26 Jun 2009 15:52:51 -0000	1.5
+++ abbr.html	29 Jun 2009 09:18:44 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>abbr &#8211; abbreviation</title>
+<title>HTML5: abbr &#8211; abbreviation</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -25,7 +25,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#abbr-content">#</a></h2>
         <div class="content-models" id="abbr-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="abbr-mdl" href="abbr.html#abbr-mdl" class="element">abbr</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- div.html	26 Jun 2009 15:52:52 -0000	1.5
+++ div.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>div &#8211; generic flow container</title>
+<title>HTML5: div &#8211; generic flow container</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -29,7 +29,7 @@
         <div class="content-models" id="div-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="div-mdl" href="div.html#div-mdl" class="element">div</a> = </span><span>
       <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meta.name.html	16 Jun 2009 18:44:27 -0000	1.5
+++ meta.name.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta name &#8211; name-value metadata</title>
+<title>HTML5: meta name &#8211; name-value metadata</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dt.html	26 Jun 2009 15:52:52 -0000	1.5
+++ dt.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>dt &#8211; term in a term-description grouping</title>
+<title>HTML5: dt &#8211; term in a term-description grouping</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -29,7 +29,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dt-content">#</a></h2>
         <div class="content-models" id="dt-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dt-mdl" href="dt.html#dt-mdl" class="element">dt</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- table.html	3 Jun 2009 10:12:58 -0000	1.5
+++ table.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>table &#8211; table</title>
+<title>HTML5: table &#8211; table</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- nav.html	26 Jun 2009 15:52:53 -0000	1.7
+++ nav.html	29 Jun 2009 09:18:48 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>nav &#8211; group of navigational links</title>
+<title>HTML5: nav &#8211; group of navigational links</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#nav-content">#</a></h2>
         <div class="content-models" id="nav-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="nav-mdl" href="nav.html#nav-mdl" class="element">nav</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- html.html	8 Jun 2009 00:53:37 -0000	1.5
+++ html.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>html &#8211; root element</title>
+<title>HTML5: html &#8211; root element</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meta.http-equiv.content-type.html	24 Jun 2009 17:36:49 -0000	1.5
+++ meta.http-equiv.content-type.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta http-equiv=content-type &#8211; document character-encoding declaration</title>
+<title>HTML5: meta http-equiv=content-type &#8211; document character-encoding declaration</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -62,8 +62,8 @@
         <div class="no-number no-toc" id="meta.http-equiv.content-type-constraints"><h2 class="element-subhead">Additional constraints <a class="hash" href="#meta.http-equiv.content-type-constraints">#</a></h2>
     <p>A <a href="meta.html#meta" class="element">meta</a> element in the
     <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
-      state</a> may be used in a <a href="syntax.html#syntax-document-html">document in the HTML syntax</a>,
-    but it must not be used in a <a href="syntax.html#syntax-document-xml">document in the XML syntax</a>.</p>
+      state</a> may be used in a <a href="html-and-xhtml.html#syntax-document-html">document in the HTML syntax</a>,
+    but it must not be used in a <a href="html-and-xhtml.html#syntax-document-xml">document in the XML syntax</a>.</p>
     <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
       state</a> per document.</p>
     <p>If a document contains a

Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- footer.html	26 Jun 2009 15:52:52 -0000	1.7
+++ footer.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>footer &#8211; footer</title>
+<title>HTML5: footer &#8211; footer</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#footer-content">#</a></h2>
         <div class="content-models" id="footer-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="footer-mdl" href="footer.html#footer-mdl" class="element">footer</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- script.html	26 Jun 2009 15:52:53 -0000	1.6
+++ script.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>script &#8211; embedded script</title>
+<title>HTML5: script &#8211; embedded script</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <dl class="content-models" id="script-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="script.html#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.range.html	3 May 2009 15:59:41 -0000	1.4
+++ input.range.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=range &#8211; imprecise number-input control</title>
+<title>HTML5: input type=range &#8211; imprecise number-input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- audio.html	26 Jun 2009 15:52:51 -0000	1.7
+++ audio.html	29 Jun 2009 09:18:44 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>audio &#8211; audio stream</title>
+<title>HTML5: audio &#8211; audio stream</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,7 +24,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- time.html	26 Jun 2009 15:52:54 -0000	1.5
+++ time.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>time &#8211; date and/or time</title>
+<title>HTML5: time &#8211; date and/or time</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#time-content">#</a></h2>
         <div class="content-models" id="time-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="time-mdl" href="time.html#time-mdl" class="element">time</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meta.http-equiv.default-style.html	8 Jun 2009 00:53:37 -0000	1.5
+++ meta.http-equiv.default-style.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta http-equiv=default-style &#8211; &#8220;preferred stylesheet&#8221; pragma directive</title>
+<title>HTML5: meta http-equiv=default-style &#8211; &#8220;preferred stylesheet&#8221; pragma directive</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.html
===================================================================
RCS file: /sources/public/html5/markup/input.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.html	6 May 2009 13:34:09 -0000	1.5
+++ input.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input</title>
+<title>HTML5: input</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: command.html
===================================================================
RCS file: /sources/public/html5/markup/command.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- command.html	3 May 2009 15:59:40 -0000	1.4
+++ command.html	29 Jun 2009 09:18:45 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>command</title>
+<title>HTML5: command</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- keygen.html	16 Jun 2009 18:44:26 -0000	1.6
+++ keygen.html	29 Jun 2009 09:18:47 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>keygen &#8211; key-pair generator/input control</title>
+<title>HTML5: keygen &#8211; key-pair generator/input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- command.command.html	16 Jun 2009 18:44:26 -0000	1.6
+++ command.command.html	29 Jun 2009 09:18:45 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>command type=command &#8211; command with an associated action</title>
+<title>HTML5: command type=command &#8211; command with an associated action</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- progress.html	26 Jun 2009 15:52:53 -0000	1.5
+++ progress.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>progress &#8211; progress indicator</title>
+<title>HTML5: progress &#8211; progress indicator</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#progress-content">#</a></h2>
         <div class="content-models" id="progress-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="progress-mdl" href="progress.html#progress-mdl" class="element">progress</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dfn.html	26 Jun 2009 15:52:52 -0000	1.5
+++ dfn.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>dfn &#8211; defining instance</title>
+<title>HTML5: dfn &#8211; defining instance</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dfn-content">#</a></h2>
         <div class="content-models" id="dfn-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dfn-mdl" href="dfn.html#dfn-mdl" class="element">dfn</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: intro.html
===================================================================
RCS file: /sources/public/html5/markup/intro.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- intro.html	3 May 2009 15:59:42 -0000	1.4
+++ intro.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Introduction and Scope</title>
+<title>HTML5: Introduction and Scope</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -30,7 +30,7 @@
     <h2>1.1. Scope <a class="hash" href="#scope">#</a> <a class="toc-bak" href="Overview.html#scope-toc">T</a></h2>
     <p>This specification limits its scope to providing
     the details necessary for HTML producers to create
-    <a href="syntax.html#documents">conformant documents</a>. It is
+    <a href="html-and-xhtml.html#documents">conformant documents</a>. It is
     designed:</p>
     <ul>
       <li>to describe the syntax, structure, and

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- textarea.html	26 Jun 2009 15:52:54 -0000	1.5
+++ textarea.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>textarea &#8211; text input area</title>
+<title>HTML5: textarea &#8211; text input area</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cite.html	26 Jun 2009 15:52:52 -0000	1.5
+++ cite.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>cite &#8211; cited title of a work</title>
+<title>HTML5: cite &#8211; cited title of a work</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#cite-content">#</a></h2>
         <div class="content-models" id="cite-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="cite-mdl" href="cite.html#cite-mdl" class="element">cite</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meter.html	26 Jun 2009 15:52:53 -0000	1.5
+++ meter.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meter &#8211; scalar gauge</title>
+<title>HTML5: meter &#8211; scalar gauge</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#meter-content">#</a></h2>
         <div class="content-models" id="meter-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="meter-mdl" href="meter.html#meter-mdl" class="element">meter</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.button.html
===================================================================
RCS file: /sources/public/html5/markup/input.button.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.button.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.button.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=button &#8211; button</title>
+<title>HTML5: input type=button &#8211; button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- aside.html	26 Jun 2009 15:52:51 -0000	1.7
+++ aside.html	29 Jun 2009 09:18:44 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>aside &#8211; tangential content</title>
+<title>HTML5: aside &#8211; tangential content</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -25,7 +25,7 @@
         <div class="content-models" id="aside-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="aside-mdl" href="aside.html#aside-mdl" class="element">aside</a> = </span><span>
       <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- syntax.html	26 Jun 2009 15:52:54 -0000	1.9
+++ syntax.html	29 Jun 2009 09:18:49 -0000	1.10
@@ -1,172 +1,52 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Syntax</title>
+<title>HTML5: HTML syntax</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
[...1094 lines suppressed...]
+     <p>The following shows an example of a CDATA section.</p>
+     <pre>
+&lt;annotation encoding="text/latex"&gt;
+  &lt;![CDATA[\documentclass{article}
+  \begin{document}
+  \title{E}
+  \maketitle
+  The base of the natural logarithms, approximately 2.71828.
+  \end{document}]]&gt;
+&lt;/annotation&gt;</pre>
+   </div>
+ </div>
 </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="terminology.html">&#171; terminology</a></span>
+<span class="nav-prev"><a href="html-and-xhtml.html">&#171; html-and-xhtml</a></span>
 <span class="nav-next"><a href="elements.html">elements &#187;</a></span>
 </div>
 </body>

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- section.html	26 Jun 2009 15:52:53 -0000	1.9
+++ section.html	29 Jun 2009 09:18:48 -0000	1.10
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>section &#8211; section</title>
+<title>HTML5: section &#8211; section</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <div class="content-models" id="section-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="section-mdl" href="section.html#section-mdl" class="element">section</a> = </span><span>
       <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- link.html	3 May 2009 15:59:42 -0000	1.4
+++ link.html	29 Jun 2009 09:18:48 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>link &#8211; inter-document relationship metadata</title>
+<title>HTML5: link &#8211; inter-document relationship metadata</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- meta.http-equiv.refresh.html	3 May 2009 15:59:42 -0000	1.4
+++ meta.http-equiv.refresh.html	29 Jun 2009 09:18:48 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta http-equiv=refresh &#8211; &#8220;refresh&#8221; pragma directive</title>
+<title>HTML5: meta http-equiv=refresh &#8211; &#8220;refresh&#8221; pragma directive</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- area.html	26 Jun 2009 15:52:51 -0000	1.5
+++ area.html	29 Jun 2009 09:18:44 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>area &#8211; image-map hyperlink</title>
+<title>HTML5: area &#8211; image-map hyperlink</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -51,7 +51,7 @@
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#area-attributes">#</a></h2>
         <dl class="attr-defs">
             <dt><a class="attribute-name" id="area.attrs.alt" title="area.attrs.alt" href="area.html#area.attrs.alt">alt</a><span class="attr-values"> = 
-      <a href="terminology.html#character-data">character data</a>
+      <a href="syntax.html#character-data">character data</a>
     </span> </dt>
             <dd>The text of the hyperlink.</dd>
           

Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.text.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.text.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=text &#8211; text-input field</title>
+<title>HTML5: input type=text &#8211; text-input field</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- samp.html	26 Jun 2009 15:52:53 -0000	1.5
+++ samp.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>samp &#8211; (sample) output</title>
+<title>HTML5: samp &#8211; (sample) output</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#samp-content">#</a></h2>
         <div class="content-models" id="samp-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="samp-mdl" href="samp.html#samp-mdl" class="element">samp</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h6.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h6.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h6 &#8211; heading (level 6)</title>
+<title>HTML5: h6 &#8211; heading (level 6)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h6-content">#</a></h2>
         <div class="content-models" id="h6-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h6-mdl" href="h6.html#h6-mdl" class="element">h6</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/input.checkbox.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.checkbox.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.checkbox.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=checkbox &#8211; checkbox</title>
+<title>HTML5: input type=checkbox &#8211; checkbox</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a.html	26 Jun 2009 15:52:51 -0000	1.5
+++ a.html	29 Jun 2009 09:18:44 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>a &#8211; hyperlink</title>
+<title>HTML5: a &#8211; hyperlink</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,13 +21,13 @@
         <dl class="content-models" id="a-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="a.html#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- object.html	26 Jun 2009 15:52:53 -0000	1.7
+++ object.html	29 Jun 2009 09:18:48 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>object &#8211; generic external resource</title>
+<title>HTML5: object &#8211; generic external resource</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -26,14 +26,14 @@
         <dt class="content-model"><span class="element-pattern-name" id="object.elem.flow"><a class="hash" href="object.html#object.elem.flow"><span class="element">object</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       <a class="ref" href="param.html#param">param</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- terminology.html	26 Jun 2009 15:52:54 -0000	1.8
+++ terminology.html	29 Jun 2009 09:18:49 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Terminology</title>
+<title>HTML5: Terminology</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -9,7 +9,7 @@
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
 <span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
-<span class="nav-next"><a href="syntax.html">syntax &#187;</a></span>
+<span class="nav-next"><a href="html-and-xhtml.html">html-and-xhtml &#187;</a></span>
 </div>
 <div id="terminology" class="section">
   <h2>4. Terminology <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
@@ -36,15 +36,8 @@
       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>
+    <dd>For <a href="html-and-xhtml.html#syntax-document-xml">documents in the XML
+        syntax</a>, <a href="syntax.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:
@@ -80,7 +73,7 @@
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
-<span class="nav-next"><a href="syntax.html">syntax &#187;</a></span>
+<span class="nav-next"><a href="html-and-xhtml.html">html-and-xhtml &#187;</a></span>
 </div>
 </body>
 </html>

Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- input.tel.html	16 Jun 2009 18:44:26 -0000	1.3
+++ input.tel.html	29 Jun 2009 09:18:47 -0000	1.4
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=tel &#8211; telephone-number-input field</title>
+<title>HTML5: input type=tel &#8211; telephone-number-input field</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h4.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h4.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h4 &#8211; heading (level 4)</title>
+<title>HTML5: h4 &#8211; heading (level 4)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h4-content">#</a></h2>
         <div class="content-models" id="h4-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h4-mdl" href="h4.html#h4-mdl" class="element">h4</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- header.html	26 Jun 2009 15:52:52 -0000	1.7
+++ header.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>header &#8211; header</title>
+<title>HTML5: header &#8211; header</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#header-content">#</a></h2>
         <div class="content-models" id="header-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="header-mdl" href="header.html#header-mdl" class="element">header</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- b.html	26 Jun 2009 15:52:51 -0000	1.5
+++ b.html	29 Jun 2009 09:18:44 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>b &#8211; offset text typically styled in bold</title>
+<title>HTML5: b &#8211; offset text typically styled in bold</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,7 +24,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#b-content">#</a></h2>
         <div class="content-models" id="b-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="b-mdl" href="b.html#b-mdl" class="element">b</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- img.html	26 Jun 2009 15:52:52 -0000	1.6
+++ img.html	29 Jun 2009 09:18:47 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>img &#8211; image</title>
+<title>HTML5: img &#8211; image</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -45,7 +45,7 @@
         scripted.</dd>
           
             <dt><a class="attribute-name" id="img.attrs.alt" title="img.attrs.alt" href="img.html#img.attrs.alt">alt</a><span class="attr-values"> = 
-      <a href="terminology.html#character-data">character data</a>
+      <a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bdo.html	26 Jun 2009 15:52:51 -0000	1.5
+++ bdo.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>bdo &#8211; BiDi override</title>
+<title>HTML5: bdo &#8211; BiDi override</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#bdo-content">#</a></h2>
         <div class="content-models" id="bdo-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="bdo-mdl" href="bdo.html#bdo-mdl" class="element">bdo</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.number.html	3 May 2009 15:59:41 -0000	1.4
+++ input.number.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=number &#8211; number input control</title>
+<title>HTML5: input type=number &#8211; number input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- col.html	3 Jun 2009 12:42:41 -0000	1.5
+++ col.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>col &#8211; table column</title>
+<title>HTML5: col &#8211; table column</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- datatypes.html	26 Jun 2009 15:52:52 -0000	1.12
+++ datatypes.html	29 Jun 2009 09:18:46 -0000	1.13
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Datatypes</title>
+<title>HTML5: Datatypes</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -12,24 +12,25 @@
 <span class="nav-next"><a href="references.html">references &#187;</a></span>
 </div>
 <div id="datatypes" class="section">
-        <h2>10. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a></h2>
+        <h2>11. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a></h2>
         <div id="data-string-def" class="section">
-    <h2>10.1. String <a class="hash" href="#data-string-def">#</a></h2>
+    <h2>11.1. String <a class="hash" href="#data-string-def">#</a></h2>
     <p>For any pattern in this document that references the <a href="datatypes.html#data-string">string</a> datatype, a
     <dfn id="data-string" title="string">string</dfn>
-    is defined as <a href="terminology.html#character-data">character data</a>
+    is defined as <a href="syntax.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>
+    <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <p>The <a href="syntax.html#syntax-attributes">Attributes</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>
+    <h2>11.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
     <dfn id="data-token" title="token">token</dfn>
     is defined
@@ -37,7 +38,7 @@
     any <a href="terminology.html#space">space characters</a>.</p>
   </div>
       <div id="common.data.tokens-mdl" class="section">
-        <h2 class="common-subhead">10.3. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
+        <h2 class="common-subhead">11.3. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.tokens" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -46,12 +47,12 @@
     </div>
       </div>
       <div id="common.data.browsing-context-mdl" class="section">
-        <h2 class="common-subhead">10.4. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a></h2>
+        <h2 class="common-subhead">11.4. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context">browsing-context</dfn></span><code class="punc"> = </code><code class="regexp">()|([^_].*)</code> <a href="datatypes.html#common.data.browsing-context" class="hash">#</a></div></div>
       </div>
       <div id="common.data.browsing-context-or-keyword-mdl" class="section">
-        <h2 class="common-subhead">10.5. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a></h2>
+        <h2 class="common-subhead">11.5. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-or-keyword" class="hash">#</a></div>
       <div class="datatype-desc">A string that is an
@@ -70,17 +71,17 @@
     </div>
       </div>
       <div id="common.data.id-mdl" class="section">
-        <h2 class="common-subhead">10.6. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
+        <h2 class="common-subhead">11.6. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.id">id</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.id" class="hash">#</a></div></div>
       </div>
       <div id="common.data.idref-mdl" class="section">
-        <h2 class="common-subhead">10.7. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
+        <h2 class="common-subhead">11.7. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idref">idref</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.idref" class="hash">#</a></div></div>
       </div>
       <div id="common.data.idrefs-mdl" class="section">
-        <h2 class="common-subhead">10.8. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
+        <h2 class="common-subhead">11.8. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idrefs" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -89,12 +90,12 @@
       </div>
       </div>
       <div id="common.data.name-mdl" class="section">
-        <h2 class="common-subhead">10.9. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
+        <h2 class="common-subhead">11.9. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.name">name</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.name" class="hash">#</a></div></div>
       </div>
       <div id="common.data.hash-name-mdl" class="section">
-        <h2 class="common-subhead">10.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
+        <h2 class="common-subhead">11.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code><code class="regexp">#.+</code> <a href="datatypes.html#common.data.hash-name" class="hash">#</a></div>
       <div class="datatype-desc">A valid <dfn id="hash-name">hash-name reference</dfn> to an element of
@@ -105,37 +106,37 @@
     </div>
       </div>
       <div id="common.data.integer-mdl" class="section">
-        <h2 class="common-subhead">10.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
+        <h2 class="common-subhead">11.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer">integer</dfn></span><code class="punc"> = </code><code class="regexp">-?[0-9]+</code> <a href="datatypes.html#common.data.integer" class="hash">#</a></div></div>
       </div>
       <div id="common.data.integer.positive-mdl" class="section">
-        <h2 class="common-subhead">10.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">11.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.positive">integer.positive</dfn></span><code class="punc"> = </code><code class="regexp">0*[1-9][0-9]*</code> <a href="datatypes.html#common.data.integer.positive" class="hash">#</a></div></div>
       </div>
       <div id="common.data.integer.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">11.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.non-negative">integer.non-negative</dfn></span><code class="punc"> = </code><code class="regexp">[0-9]+</code> <a href="datatypes.html#common.data.integer.non-negative" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float-mdl" class="section">
-        <h2 class="common-subhead">10.14. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
+        <h2 class="common-subhead">11.14. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float">float</dfn></span><code class="punc"> = </code><code class="regexp">-?((\.[0-9]+)|([0-9]+(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float.positive-mdl" class="section">
-        <h2 class="common-subhead">10.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">11.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.positive">float.positive</dfn></span><code class="punc"> = </code><code class="regexp">0*((\.0*[1-9][0-9]*)|([1-9][0-9]*(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float.positive" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">11.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.non-negative">float.non-negative</dfn></span><code class="punc"> = </code><code class="regexp">((\.[0-9]+)|([0-9]+(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float.non-negative" class="hash">#</a></div></div>
       </div>
       <div id="common.data.datetime-mdl" class="section">
-        <h2 class="common-subhead">10.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
+        <h2 class="common-subhead">11.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.datetime">datetime</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.datetime" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">date-time</b>, as defined in RFC 3339 <a href="references.html#refsRFC3339">[RFC3339]</a>, with these additional
@@ -157,14 +158,14 @@
     </div>
       </div>
       <div id="common.data.date-or-time-mdl" class="section">
-        <h2 class="common-subhead">10.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
+        <h2 class="common-subhead">11.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.date-or-time">date-or-time</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a>
       | <a href="datatypes.html#form.data.time">time</a>
       | <a href="datatypes.html#common.data.datetime">datetime</a> <a href="datatypes.html#common.data.date-or-time" class="hash">#</a></div></div>
       </div>
       <div id="common.data.uri-mdl" class="section">
-        <h2 class="common-subhead">10.19. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
+        <h2 class="common-subhead">11.19. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri">uri</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.iri-ref">IRI-reference</a> <a href="datatypes.html#common.data.uri" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.iri-ref">IRI-reference</dfn> is
@@ -177,7 +178,7 @@
     </div>
       </div>
       <div id="common.data.uris-mdl" class="section">
-        <h2 class="common-subhead">10.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
+        <h2 class="common-subhead">11.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uris" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -186,7 +187,7 @@
     </div>
       </div>
       <div id="common.data.uri.absolute-mdl" class="section">
-        <h2 class="common-subhead">10.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
+        <h2 class="common-subhead">11.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri.absolute">uri.absolute</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.iri">IRI</a> <a href="datatypes.html#common.data.uri.absolute" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.iri">IRI</dfn> is
@@ -201,12 +202,12 @@
     </div>
       </div>
       <div id="common.data.sizes-mdl" class="section">
-        <h2 class="common-subhead">10.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
+        <h2 class="common-subhead">11.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.sizes">sizes</dfn></span><code class="punc"> = </code><code class="regexp">[1-9][0-9]*x[1-9][0-9]*</code> <a href="datatypes.html#common.data.sizes" class="hash">#</a></div></div>
       </div>
       <div id="common.data.mimetype-mdl" class="section">
-        <h2 class="common-subhead">10.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
+        <h2 class="common-subhead">11.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mimetype">mimetype</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mimetype" class="hash">#</a></div>
       <div class="datatype-desc">A string that identifies a valid
@@ -214,15 +215,15 @@
           defined in RFC 2046 <a href="references.html#refsRFC2046">[RFC2046]</a>.</div> </div>
       </div>
       <div id="common.data.charset-mdl" class="section">
-        <h2 class="common-subhead">10.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
+        <h2 class="common-subhead">11.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
-        <p>For documents in the <a href="syntax.html#html-syntax">HTML
+        <p>For documents in the <a href="html-and-xhtml.html#html-syntax">HTML
           syntax</a>: Any <b class="defined-elsewhere">character
           set name</b> listed in the IANA <cite>Character Sets</cite>
         list <a href="references.html#refsIANACHARSET">[IANACHARSET]</a>.</p>
-        <p>For documents in the <a href="syntax.html#xml-syntax">XML
+        <p>For documents in the <a href="html-and-xhtml.html#xml-syntax">XML
           syntax</a>, any <a href="terminology.html#ascii-case-insensitive">ASCII
           case-insensitive</a> match for the string
         "<code>UTF-8</code>".</p>
@@ -230,7 +231,7 @@
     </div>
       </div>
       <div id="common.data.meta-charset-mdl" class="section">
-        <h2 class="common-subhead">10.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
+        <h2 class="common-subhead">11.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.meta-charset">meta-charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.meta-charset" class="hash">#</a></div>
       <div class="datatype-desc">A string that is an <a href="terminology.html#ascii-case-insensitive">ASCII
@@ -240,7 +241,7 @@
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
-        <h2 class="common-subhead">10.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
+        <h2 class="common-subhead">11.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.refresh" class="hash">#</a></div>
       <div class="datatype-desc">One of the following:
@@ -255,12 +256,12 @@
     </div>
       </div>
       <div id="common.data.default-style-mdl" class="section">
-        <h2 class="common-subhead">10.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
+        <h2 class="common-subhead">11.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-string">string</a> <a href="datatypes.html#common.data.default-style" class="hash">#</a></div></div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
-        <h2 class="common-subhead">10.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
+        <h2 class="common-subhead">11.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mediaquery">mediaquery</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mediaquery" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">media query</b>, as defined in
@@ -268,7 +269,7 @@
     </div>
       </div>
       <div id="common.data.langcode-mdl" class="section">
-        <h2 class="common-subhead">10.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
+        <h2 class="common-subhead">11.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.language">language-tag</a> <a href="datatypes.html#common.data.langcode" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.language">language-tag</dfn> is a valid <b class="defined-elsewhere">language tag</b>, as defined
@@ -276,7 +277,7 @@
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
-        <h2 class="common-subhead">10.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.keylabellist">keylabellist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.keylabellist" class="hash">#</a></div>
       <div class="datatype-desc">An ordered set of unique
@@ -286,7 +287,7 @@
     </div>
       </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">10.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -295,7 +296,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">10.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -305,7 +306,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">10.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
+        <h2 class="common-subhead">11.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.pattern">pattern</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.pattern" class="hash">#</a></div>
       <div class="datatype-desc">A regular expression that must
@@ -313,7 +314,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">10.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
+        <h2 class="common-subhead">11.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a> "<code class="literal">T</code>" <a href="datatypes.html#form.data.time">time</a> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
       <div class="example">
@@ -324,7 +325,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">10.35. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
+        <h2 class="common-subhead">11.35. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.date" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">full-date</b>, as defined in
@@ -340,7 +341,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">10.36. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
+        <h2 class="common-subhead">11.36. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-" <a href="datatypes.html#data-date-month">date-month</a> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-date-month">date-month</dfn> is as defined
@@ -352,7 +353,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">10.37. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
+        <h2 class="common-subhead">11.37. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-W" <a href="datatypes.html#data-date-week">date-week</a> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-date-week">date-week</dfn> is a valid <b class="defined-elsewhere">date-week</b>, as defined
@@ -365,7 +366,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">10.38. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
+        <h2 class="common-subhead">11.38. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.time" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">partial-time</b>, as defined
@@ -379,7 +380,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">10.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
+        <h2 class="common-subhead">11.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-dot-atom">dot-atom</a> "@" <a href="datatypes.html#data-dot-atom">dot-atom</a> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-dot-atom">dot-atom</dfn> is as defined in RFC
@@ -394,7 +395,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">10.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
@@ -402,7 +403,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">10.41. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
+        <h2 class="common-subhead">11.41. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code><code class="regexp">#[a-fA-F0-9]{6}</code> <a href="datatypes.html#form.data.color" class="hash">#</a></div></div>
       </div>

Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- command.radio.html	16 Jun 2009 18:44:26 -0000	1.6
+++ command.radio.html	29 Jun 2009 09:18:45 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>command type=radio &#8211; selection of one item from a list of items</title>
+<title>HTML5: command type=radio &#8211; selection of one item from a list of items</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.datetime.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.datetime.html	3 May 2009 15:59:41 -0000	1.4
+++ input.datetime.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=datetime &#8211; global date-and-time input control</title>
+<title>HTML5: input type=datetime &#8211; global date-and-time input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.password.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.password.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=password &#8211; password-input field</title>
+<title>HTML5: input type=password &#8211; password-input field</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- embed.html	10 Jun 2009 14:59:47 -0000	1.7
+++ embed.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>embed &#8211; integration point for plugins</title>
+<title>HTML5: embed &#8211; integration point for plugins</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dd.html	26 Jun 2009 15:52:52 -0000	1.5
+++ dd.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>dd &#8211; description in a term-description grouping</title>
+<title>HTML5: dd &#8211; description in a term-description grouping</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -29,7 +29,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dd-content">#</a></h2>
         <div class="content-models" id="dd-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dd-mdl" href="dd.html#dd-mdl" class="element">dd</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common-models.html	16 Jun 2009 06:49:00 -0000	1.9
+++ common-models.html	29 Jun 2009 09:18:45 -0000	1.10
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Common content models</title>
+<title>HTML5: Common content models</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -12,9 +12,9 @@
 <span class="nav-next"><a href="common-attributes.html">common-attributes &#187;</a></span>
 </div>
 <div id="common-models" class="section">
-        <h2>7. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="Overview.html#common-models-toc">T</a></h2>
+        <h2>8. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="Overview.html#common-models-toc">T</a></h2>
       <div id="common-anything" class="section">
-        <h2 class="common-subhead">7.1. Any element from any namespace <a class="hash" href="#common-anything">#</a> <a class="toc-bak" href="Overview.html#common-anything-toc">T</a></h2>
+        <h2 class="common-subhead">8.1. Any element from any namespace <a class="hash" href="#common-anything">#</a> <a class="toc-bak" href="Overview.html#common-anything-toc">T</a></h2>
         <dl class="content-models">
           <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.anything">common.elem.anything</dfn></span> = <a class="hash" href="common-models.html#common.elem.anything">#</a></dt>
           <dd><span class="attr-prose-desc">any element from any namespace</span>
@@ -22,7 +22,7 @@
         </dl>
       </div>
       <div id="common-flow" class="section">
-        <h2 class="common-subhead">7.2. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
+        <h2 class="common-subhead">8.2. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
         <dl class="content-models">
           <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.flow">common.elem.flow</dfn></span> = <a class="hash" href="common-models.html#common.elem.flow">#</a></dt>
           <dd><a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>
@@ -69,7 +69,7 @@
         </dl>
       </div>
       <div id="common-metadata" class="section">
-        <h2 class="common-subhead">7.3. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
+        <h2 class="common-subhead">8.3. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
         <dl class="content-models">
           <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.metadata">common.elem.metadata</dfn></span> = <a class="hash" href="common-models.html#common.elem.metadata">#</a></dt>
           <dd><a class="ref" href="link.html#link">link</a>
@@ -86,7 +86,7 @@
         </dl>
       </div>
       <div id="common-phrasing" class="section">
-        <h2 class="common-subhead">7.4. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
+        <h2 class="common-subhead">8.4. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
         <dl class="content-models">
           <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.phrasing">common.elem.phrasing</dfn></span> = <a class="hash" href="common-models.html#common.elem.phrasing">#</a></dt>
           <dd><a class="ref" href="a.html#a.elem.phrasing">a.elem.phrasing</a>

Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ul.html	3 May 2009 15:59:43 -0000	1.4
+++ ul.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>ul &#8211; unordered list</title>
+<title>HTML5: ul &#8211; unordered list</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.time.html	3 May 2009 15:59:42 -0000	1.4
+++ input.time.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=time &#8211; time input control</title>
+<title>HTML5: input type=time &#8211; time input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: structure.html
===================================================================
RCS file: /sources/public/html5/markup/structure.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- structure.html	3 May 2009 15:59:43 -0000	1.4
+++ structure.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Structure of this specification</title>
+<title>HTML5: Structure of this specification</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- strong.html	26 Jun 2009 15:52:54 -0000	1.5
+++ strong.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>strong &#8211; strong importance</title>
+<title>HTML5: strong &#8211; strong importance</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#strong-content">#</a></h2>
         <div class="content-models" id="strong-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="strong-mdl" href="strong.html#strong-mdl" class="element">strong</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: acknowledgments.html
===================================================================
RCS file: /sources/public/html5/markup/acknowledgments.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- acknowledgments.html	3 May 2009 15:59:39 -0000	1.4
+++ acknowledgments.html	29 Jun 2009 09:18:44 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Acknowledgments</title>
+<title>HTML5: Acknowledgments</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.color.html
===================================================================
RCS file: /sources/public/html5/markup/input.color.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.color.html	6 May 2009 13:34:09 -0000	1.5
+++ input.color.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=color &#8211; color</title>
+<title>HTML5: input type=color &#8211; color</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- li.html	26 Jun 2009 15:52:53 -0000	1.6
+++ li.html	29 Jun 2009 09:18:47 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>li &#8211; list item</title>
+<title>HTML5: li &#8211; list item</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,19 +22,19 @@
         <dl class="content-models" id="li-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="li-pattern"><a class="hash" href="li.html#li-pattern"><span class="element">li</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>*
-  | (<a href="terminology.html#character-data">character data</a>
+  | (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.html	26 Jun 2009 15:52:54 -0000	1.5
+++ style.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>style &#8211; style (presentation) information</title>
+<title>HTML5: style &#8211; style (presentation) information</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,13 +23,13 @@
         <dl class="content-models" id="style-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="style-pattern"><a class="hash" href="style.html#style-pattern"><span class="element">style</span></a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- caption.html	26 Jun 2009 15:52:52 -0000	1.5
+++ caption.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>caption &#8211; table title</title>
+<title>HTML5: caption &#8211; table title</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#caption-content">#</a></h2>
         <div class="content-models" id="caption-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="caption-mdl" href="caption.html#caption-mdl" class="element">caption</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- del.html	26 Jun 2009 15:52:52 -0000	1.8
+++ del.html	29 Jun 2009 09:18:46 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>del &#8211; deleted text</title>
+<title>HTML5: del &#8211; deleted text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,13 +23,13 @@
         <dl class="content-models" id="del-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="del.elem.flow"><a class="hash" href="del.html#del.elem.flow"><span class="element">del</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- menu.html	26 Jun 2009 15:52:53 -0000	1.6
+++ menu.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>menu &#8211; list of commands</title>
+<title>HTML5: menu &#8211; list of commands</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <div class="content-models" id="menu-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="menu-mdl" href="menu.html#menu-mdl" class="element">menu</a> = </span><span>
       (<a class="ref" href="li.html#mli">li</a>*
-  | (<a href="terminology.html#character-data">character data</a>
+  | (<a href="syntax.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: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.image.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.image.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=image &#8211; image-coordinates input control</title>
+<title>HTML5: input type=image &#8211; image-coordinates input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- code.html	26 Jun 2009 15:52:52 -0000	1.5
+++ code.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>code &#8211; code fragment</title>
+<title>HTML5: code &#8211; code fragment</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#code-content">#</a></h2>
         <div class="content-models" id="code-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="code-mdl" href="code.html#code-mdl" class="element">code</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h2.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h2.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h2 &#8211; heading (level 2)</title>
+<title>HTML5: h2 &#8211; heading (level 2)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h2-content">#</a></h2>
         <div class="content-models" id="h2-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h2-mdl" href="h2.html#h2-mdl" class="element">h2</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: head.html
===================================================================
RCS file: /sources/public/html5/markup/head.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- head.html	3 May 2009 15:59:41 -0000	1.4
+++ head.html	29 Jun 2009 09:18:46 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>head &#8211; document metadata</title>
+<title>HTML5: head &#8211; document metadata</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- p.html	26 Jun 2009 15:52:53 -0000	1.6
+++ p.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>p &#8211; paragraph</title>
+<title>HTML5: p &#8211; paragraph</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#p-content">#</a></h2>
         <div class="content-models" id="p-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="p-mdl" href="p.html#p-mdl" class="element">p</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- map.html	26 Jun 2009 15:52:53 -0000	1.6
+++ map.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>map &#8211; image-map definition</title>
+<title>HTML5: map &#8211; image-map definition</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,13 +23,13 @@
         <dl class="content-models" id="map-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="map.html#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.file.html	3 May 2009 15:59:41 -0000	1.4
+++ input.file.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=file &#8211; file upload control</title>
+<title>HTML5: input type=file &#8211; file upload control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.radio.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.radio.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=radio &#8211; radio button</title>
+<title>HTML5: input type=radio &#8211; radio button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- command.checkbox.html	16 Jun 2009 18:44:26 -0000	1.6
+++ command.checkbox.html	29 Jun 2009 09:18:45 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>command type=checkbox &#8211; state or option that can be toggled</title>
+<title>HTML5: command type=checkbox &#8211; state or option that can be toggled</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- param.html	26 Jun 2009 15:52:53 -0000	1.6
+++ param.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>param &#8211; initialization parameters for plugins</title>
+<title>HTML5: param &#8211; initialization parameters for plugins</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -55,10 +55,10 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#param-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- span.html	26 Jun 2009 15:52:53 -0000	1.5
+++ span.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>span &#8211; generic span</title>
+<title>HTML5: span &#8211; generic span</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -28,7 +28,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#span-content">#</a></h2>
         <div class="content-models" id="span-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="span-mdl" href="span.html#span-mdl" class="element">span</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.reset.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.reset.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=reset &#8211; reset button</title>
+<title>HTML5: input type=reset &#8211; reset button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.datetime-local.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime-local.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.datetime-local.html	3 May 2009 15:59:41 -0000	1.4
+++ input.datetime-local.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=datetime-local &#8211; local date-and-time input control</title>
+<title>HTML5: input type=datetime-local &#8211; local date-and-time input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: meta.html
===================================================================
RCS file: /sources/public/html5/markup/meta.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- meta.html	3 May 2009 15:59:42 -0000	1.4
+++ meta.html	29 Jun 2009 09:18:48 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta</title>
+<title>HTML5: meta</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- q.html	26 Jun 2009 15:52:53 -0000	1.5
+++ q.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>q &#8211; quoted text</title>
+<title>HTML5: q &#8211; quoted text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#q-content">#</a></h2>
         <div class="content-models" id="q-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="q-mdl" href="q.html#q-mdl" class="element">q</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: conformance.html
===================================================================
RCS file: /sources/public/html5/markup/conformance.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conformance.html	3 May 2009 15:59:40 -0000	1.4
+++ conformance.html	29 Jun 2009 09:18:45 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Conformance requirements</title>
+<title>HTML5: Conformance requirements</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- common-attributes.html	26 Jun 2009 15:52:52 -0000	1.6
+++ common-attributes.html	29 Jun 2009 09:18:45 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Common attributes</title>
+<title>HTML5: Common attributes</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -12,7 +12,7 @@
 <span class="nav-next"><a href="shared-attributes.html">shared-attributes &#187;</a></span>
 </div>
 <div id="common-attributes" class="section">
-        <h2>8. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="Overview.html#common-attributes-toc">T</a></h2>
+        <h2>9. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="Overview.html#common-attributes-toc">T</a></h2>
         <div id="common.attrs-mdl">
         <dl class="content-models">
             <dt class="content-model"><span class="common-pattern-name"><a href="common-attributes.html#common.attrs" id="common.attrs">common.attrs</a></span> = </dt><dd><a class="ref" href="common-attributes.html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a>
@@ -24,7 +24,7 @@
           </dl>
         </div>
       <div id="basic-attrs" class="section">
-        <h2 class="common-subhead">8.1. Basic attributes <a class="hash" href="#basic-attrs">#</a> <a class="toc-bak" href="Overview.html#basic-attrs-toc">T</a></h2><div id="common.attrs.basic-mdl">
+        <h2 class="common-subhead">9.1. Basic attributes <a class="hash" href="#basic-attrs">#</a> <a class="toc-bak" href="Overview.html#basic-attrs-toc">T</a></h2><div id="common.attrs.basic-mdl">
         
           <div class="content-models">
             <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.basic" id="common.attrs.basic">common.attrs.basic</a></span> = (<a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a>
@@ -51,7 +51,7 @@
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
             <dt><a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="common-attributes.html#common.attrs.title">title</a><span class="attr-values"> = 
-      <a href="terminology.html#character-data">character data</a>
+      <a href="syntax.html#character-data">character data</a>
     </span> </dt>
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
@@ -64,7 +64,7 @@
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
         </dl></div></div><div id="i18n-attrs" class="section">
-        <h2 class="common-subhead">8.2. Internationalization attributes <a class="hash" href="#i18n-attrs">#</a> <a class="toc-bak" href="Overview.html#i18n-attrs-toc">T</a></h2><div id="common.attrs.i18n-mdl">
+        <h2 class="common-subhead">9.2. Internationalization attributes <a class="hash" href="#i18n-attrs">#</a> <a class="toc-bak" href="Overview.html#i18n-attrs-toc">T</a></h2><div id="common.attrs.i18n-mdl">
         
           <div class="content-models">
             <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.i18n" id="common.attrs.i18n">common.attrs.i18n</a></span> = <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a>?
@@ -88,7 +88,7 @@
             <dd><i class="TK">(detailed attribute description to come)</i></dd>
           
         </dl></div></div><div id="present-attrs" class="section">
-        <h2 class="common-subhead">8.3. Present attributes <a class="hash" href="#present-attrs">#</a> <a class="toc-bak" href="Overview.html#present-attrs-toc">T</a></h2><div id="common.attrs.present-mdl">
+        <h2 class="common-subhead">9.3. Present attributes <a class="hash" href="#present-attrs">#</a> <a class="toc-bak" href="Overview.html#present-attrs-toc">T</a></h2><div id="common.attrs.present-mdl">
         
           <div class="content-models">
             <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.present" id="common.attrs.present">common.attrs.present</a></span> = <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a>?
@@ -113,7 +113,7 @@
           
         </dl></div></div>
         <div id="common.attrs.scripting-attrs" class="section">
-        <h2 class="common-subhead">8.4. Scripting attributes <a class="hash" href="#common.attrs.scripting-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.scripting-attrs-toc">T</a></h2><div id="common.attrs.scripting-mdl">
+        <h2 class="common-subhead">9.4. Scripting attributes <a class="hash" href="#common.attrs.scripting-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.scripting-attrs-toc">T</a></h2><div id="common.attrs.scripting-mdl">
         
           <div class="content-models">
             <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.scripting" id="common.attrs.scripting">common.attrs.scripting</a></span> = (<a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a>?
@@ -253,7 +253,7 @@
       </div>
     </div>
         <div id="common.attrs.interact-attrs" class="section">
-        <h2 class="common-subhead">8.5. Interaction attributes <a class="hash" href="#common.attrs.interact-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.interact-attrs-toc">T</a></h2><div id="common.attrs.interact-mdl">
+        <h2 class="common-subhead">9.5. Interaction attributes <a class="hash" href="#common.attrs.interact-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.interact-attrs-toc">T</a></h2><div id="common.attrs.interact-mdl">
         
           <div class="content-models">
             <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.interact" id="common.attrs.interact">common.attrs.interact</a></span> = (<a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>?

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- option.html	26 Jun 2009 15:52:53 -0000	1.6
+++ option.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>option &#8211; option</title>
+<title>HTML5: option &#8211; option</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -70,7 +70,7 @@
         <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a>*
   &amp; <a class="ref" href="option.html#option">option</a>*</li>
         <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a>*
-  &amp; (<a href="terminology.html#character-data">character data</a>
+  &amp; (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- label.html	26 Jun 2009 15:52:53 -0000	1.5
+++ label.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>label &#8211; caption for a form control</title>
+<title>HTML5: label &#8211; caption for a form control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#label-content">#</a></h2>
         <div class="content-models" id="label-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="label-mdl" href="label.html#label-mdl" class="element">label</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- select.html	16 Jun 2009 06:49:01 -0000	1.6
+++ select.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>select &#8211; option-selection form control</title>
+<title>HTML5: select &#8211; option-selection form control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- noscript.html	26 Jun 2009 15:52:53 -0000	1.5
+++ noscript.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>noscript &#8211; fallback content for script</title>
+<title>HTML5: noscript &#8211; fallback content for script</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -32,13 +32,13 @@
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.phrasing"><a class="hash" href="noscript.html#noscript.elem.phrasing"><span class="element">noscript</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
@@ -69,7 +69,7 @@
       
         <div class="no-number no-toc" id="noscript-constraints"><h2 class="element-subhead">Additional constraints <a class="hash" href="#noscript-constraints">#</a></h2>
     <p>The <code><a href="noscript.html#noscript">noscript</a></code> element
-    must not be used in a <a href="syntax.html#syntax-document-xml">document in the XML syntax</a>.</p>
+    must not be used in a <a href="html-and-xhtml.html#syntax-document-xml">document in the XML syntax</a>.</p>
   </div>
       <div class="no-number no-toc" id="noscript-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#noscript-context">#</a></h2>

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blockquote.html	26 Jun 2009 15:52:51 -0000	1.5
+++ blockquote.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>blockquote &#8211; block quotation</title>
+<title>HTML5: blockquote &#8211; block quotation</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content">#</a></h2>
         <div class="content-models" id="blockquote-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="blockquote-mdl" href="blockquote.html#blockquote-mdl" class="element">blockquote</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hr.html	3 May 2009 15:59:41 -0000	1.5
+++ hr.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>hr &#8211; thematic break</title>
+<title>HTML5: hr &#8211; thematic break</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- td.html	26 Jun 2009 15:52:54 -0000	1.5
+++ td.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>td &#8211; table cell</title>
+<title>HTML5: td &#8211; table cell</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#td-content">#</a></h2>
         <div class="content-models" id="td-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="td-mdl" href="td.html#td-mdl" class="element">td</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- em.html	26 Jun 2009 15:52:52 -0000	1.5
+++ em.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>em &#8211; emphatic stress</title>
+<title>HTML5: em &#8211; emphatic stress</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#em-content">#</a></h2>
         <div class="content-models" id="em-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="em-mdl" href="em.html#em-mdl" class="element">em</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- figure.html	26 Jun 2009 15:52:52 -0000	1.5
+++ figure.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>figure &#8211; figure with optional caption</title>
+<title>HTML5: figure &#8211; figure with optional caption</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,9 +24,9 @@
         <div class="content-models" id="figure-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="figure-mdl" href="figure.html#figure-mdl" class="element">figure</a> = </span><span>
       (<a class="ref" href="legend.html#legend">legend</a>,
-   (<a href="terminology.html#character-data">character data</a>
+   (<a href="syntax.html#character-data">character data</a>
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a href="terminology.html#character-data">character data</a>
+  | ((<a href="syntax.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: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.hidden.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.hidden.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=hidden &#8211; hidden input control</title>
+<title>HTML5: input type=hidden &#8211; hidden input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kbd.html	26 Jun 2009 15:52:53 -0000	1.5
+++ kbd.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>kbd &#8211; user input</title>
+<title>HTML5: kbd &#8211; user input</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#kbd-content">#</a></h2>
         <div class="content-models" id="kbd-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="kbd-mdl" href="kbd.html#kbd-mdl" class="element">kbd</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: references.html
===================================================================
RCS file: /sources/public/html5/markup/references.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- references.html	13 Jun 2009 09:12:01 -0000	1.7
+++ references.html	29 Jun 2009 09:18:48 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>References</title>
+<title>HTML5: References</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- base.html	10 Jun 2009 10:42:28 -0000	1.6
+++ base.html	29 Jun 2009 09:18:45 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>base &#8211; base URL</title>
+<title>HTML5: base &#8211; base URL</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- canvas.html	26 Jun 2009 15:52:52 -0000	1.5
+++ canvas.html	29 Jun 2009 09:18:45 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>canvas &#8211; canvas for dynamic graphics</title>
+<title>HTML5: canvas &#8211; canvas for dynamic graphics</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,13 +24,13 @@
         <dl class="content-models" id="canvas-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="canvas.elem.flow"><a class="hash" href="canvas.html#canvas.elem.flow"><span class="element">canvas</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- input.search.html	16 Jun 2009 18:44:26 -0000	1.6
+++ input.search.html	29 Jun 2009 09:18:47 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=search &#8211; search field</title>
+<title>HTML5: input type=search &#8211; search field</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tfoot.html	3 May 2009 15:59:43 -0000	1.4
+++ tfoot.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>tfoot &#8211; table footer row group</title>
+<title>HTML5: tfoot &#8211; table footer row group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rt.html	26 Jun 2009 15:52:53 -0000	1.6
+++ rt.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>rt &#8211; ruby text</title>
+<title>HTML5: rt &#8211; ruby text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#rt-content">#</a></h2>
         <div class="content-models" id="rt-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="rt-mdl" href="rt.html#rt-mdl" class="element">rt</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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> = ((<a href="terminology.html#character-data">character data</a>
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fieldset.html	26 Jun 2009 15:52:52 -0000	1.5
+++ fieldset.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>fieldset &#8211; set of related form controls</title>
+<title>HTML5: fieldset &#8211; set of related form controls</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <div class="content-models" id="fieldset-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="fieldset-mdl" href="fieldset.html#fieldset-mdl" class="element">fieldset</a> = </span><span>
       <a class="ref" href="legend.html#legend">legend</a>?,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- spec.html	26 Jun 2009 15:52:53 -0000	1.42
+++ spec.html	29 Jun 2009 09:18:49 -0000	1.43
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>26 June 2009</em>
+<h2>Editor&#8217;s Draft <em>29 June 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
[...1823 lines suppressed...]
         <div class="content-models">
           <div>
@@ -14844,7 +14854,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">10.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
+        <h2 class="common-subhead">11.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14855,7 +14865,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">10.41. Color <a class="hash" href="#form.data.color-mdl">#</a>
+        <h2 class="common-subhead">11.41. Color <a class="hash" href="#form.data.color-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- datalist.html	26 Jun 2009 15:52:52 -0000	1.6
+++ datalist.html	29 Jun 2009 09:18:46 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>datalist &#8211; predefined options for other controls</title>
+<title>HTML5: datalist &#8211; predefined options for other controls</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -27,7 +27,7 @@
         <div class="content-models" id="datalist-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="datalist-mdl" href="datalist.html#datalist-mdl" class="element">datalist</a> = </span><span>
       <a class="ref" href="option.html#option">option</a>*
-  &amp; (<a href="terminology.html#character-data">character data</a>
+  &amp; (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h1.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h1.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h1 &#8211; heading (level 1)</title>
+<title>HTML5: h1 &#8211; heading (level 1)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h1-content">#</a></h2>
         <div class="content-models" id="h1-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h1-mdl" href="h1.html#h1-mdl" class="element">h1</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h3.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h3.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h3 &#8211; heading (level 3)</title>
+<title>HTML5: h3 &#8211; heading (level 3)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h3-content">#</a></h2>
         <div class="content-models" id="h3-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h3-mdl" href="h3.html#h3-mdl" class="element">h3</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: optgroup.html
===================================================================
RCS file: /sources/public/html5/markup/optgroup.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- optgroup.html	16 Jun 2009 18:44:27 -0000	1.5
+++ optgroup.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>optgroup &#8211; group of options</title>
+<title>HTML5: optgroup &#8211; group of options</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.week.html	3 May 2009 15:59:42 -0000	1.4
+++ input.week.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=week &#8211; year-and-week input control</title>
+<title>HTML5: input type=week &#8211; year-and-week input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- button.button.html	26 Jun 2009 15:52:52 -0000	1.8
+++ button.button.html	29 Jun 2009 09:18:45 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>button type=button &#8211; button with no additional semantics</title>
+<title>HTML5: button type=button &#8211; button with no additional semantics</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.button-content">#</a></h2>
         <div class="content-models" id="button.button-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.button-mdl" href="button.button.html#button.button-mdl"><span class="element">button</span>.button</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- form.html	26 Jun 2009 15:52:52 -0000	1.5
+++ form.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>form &#8211; user-submittable form</title>
+<title>HTML5: form &#8211; user-submittable form</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#form-content">#</a></h2>
         <div class="content-models" id="form-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="form-mdl" href="form.html#form-mdl" class="element">form</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- small.html	26 Jun 2009 15:52:53 -0000	1.5
+++ small.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>small &#8211; small print</title>
+<title>HTML5: small &#8211; small print</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#small-content">#</a></h2>
         <div class="content-models" id="small-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="small-mdl" href="small.html#small-mdl" class="element">small</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ruby.html	26 Jun 2009 15:52:53 -0000	1.6
+++ ruby.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>ruby &#8211; ruby annotation</title>
+<title>HTML5: ruby &#8211; ruby annotation</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -22,7 +22,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#ruby-content">#</a></h2>
         <div class="content-models" id="ruby-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="ruby-mdl" href="ruby.html#ruby-mdl" class="element">ruby</a> = </span><span>
-      ((<a href="terminology.html#character-data">character data</a>
+      ((<a href="syntax.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: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ol.html	16 Jun 2009 06:49:00 -0000	1.5
+++ ol.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>ol &#8211; ordered list</title>
+<title>HTML5: ol &#8211; ordered list</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- article.html	26 Jun 2009 15:52:51 -0000	1.9
+++ article.html	29 Jun 2009 09:18:44 -0000	1.10
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>article &#8211; article</title>
+<title>HTML5: article &#8211; article</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,7 +24,7 @@
         <div class="content-models" id="article-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="article-mdl" href="article.html#article-mdl" class="element">article</a> = </span><span>
       <a class="ref" href="style.html#style-pattern">style</a>*,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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: dialog.html
===================================================================
RCS file: /sources/public/html5/markup/dialog.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dialog.html	3 May 2009 15:59:40 -0000	1.4
+++ dialog.html	29 Jun 2009 09:18:46 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>dialog &#8211; conversation</title>
+<title>HTML5: dialog &#8211; conversation</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- elements.html	5 Jun 2009 08:58:35 -0000	1.9
+++ elements.html	29 Jun 2009 09:18:46 -0000	1.10
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML elements</title>
+<title>HTML5: Elements</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -12,7 +12,7 @@
 <span class="nav-next"><a href="common-models.html">common-models &#187;</a></span>
 </div>
 <div id="elements" class="section">
-        <h2>6. HTML elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2><div class="toc">
+        <h2>7. Elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2><div class="toc">
 <ul>
 <li id="a-toc"><a href="a.html#a"><span class="element">a</span> &#8211; <span class="shortdesc">hyperlink</span></a>
 </li>

Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- colgroup.html	3 May 2009 15:59:40 -0000	1.4
+++ colgroup.html	29 Jun 2009 09:18:45 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>colgroup &#8211; table column group</title>
+<title>HTML5: colgroup &#8211; table column group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dl.html	3 May 2009 15:59:40 -0000	1.4
+++ dl.html	29 Jun 2009 09:18:46 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>dl &#8211; description list</title>
+<title>HTML5: dl &#8211; description list</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thead.html	3 May 2009 15:59:43 -0000	1.4
+++ thead.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>thead &#8211; table header row group</title>
+<title>HTML5: thead &#8211; table header row group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/tbody.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tbody.html	3 May 2009 15:59:43 -0000	1.4
+++ tbody.html	29 Jun 2009 09:18:49 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>tbody &#8211; table row group</title>
+<title>HTML5: tbody &#8211; table row group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- video.html	26 Jun 2009 15:52:54 -0000	1.7
+++ video.html	29 Jun 2009 09:18:49 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>video &#8211; video</title>
+<title>HTML5: video &#8211; video</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -24,7 +24,7 @@
         <dd class="elem-mdl"><span>
       (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- source.html	26 Jun 2009 15:52:53 -0000	1.8
+++ source.html	29 Jun 2009 09:18:48 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>source &#8211; media resource</title>
+<title>HTML5: source &#8211; media resource</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -75,19 +75,19 @@
         <ul>
         <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
    | <a class="ref" href=".html#source-pattern">source</a>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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>*),
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- button.reset.html	26 Jun 2009 15:52:52 -0000	1.8
+++ button.reset.html	29 Jun 2009 09:18:45 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>button type=reset &#8211; reset button</title>
+<title>HTML5: button type=reset &#8211; reset button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content">#</a></h2>
         <div class="content-models" id="button.reset-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.reset-mdl" href="button.reset.html#button.reset-mdl"><span class="element">button</span>.reset</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- meta.charset.html	24 Jun 2009 17:36:49 -0000	1.7
+++ meta.charset.html	29 Jun 2009 09:18:48 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>meta charset &#8211; document character-encoding declaration</title>
+<title>HTML5: meta charset &#8211; document character-encoding declaration</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- output.html	26 Jun 2009 15:52:53 -0000	1.5
+++ output.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>output &#8211; result of a calculation in a form</title>
+<title>HTML5: output &#8211; result of a calculation in a form</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#output-content">#</a></h2>
         <div class="content-models" id="output-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="output-mdl" href="output.html#output-mdl" class="element">output</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- i.html	26 Jun 2009 15:52:52 -0000	1.5
+++ i.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>i &#8211; offset text typically styled in italic</title>
+<title>HTML5: i &#8211; offset text typically styled in italic</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#i-content">#</a></h2>
         <div class="content-models" id="i-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="i-mdl" href="i.html#i-mdl" class="element">i</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- input.submit.html	16 Jun 2009 18:44:26 -0000	1.5
+++ input.submit.html	29 Jun 2009 09:18:47 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=submit &#8211; submit button</title>
+<title>HTML5: input type=submit &#8211; submit button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: input.date.html
===================================================================
RCS file: /sources/public/html5/markup/input.date.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.date.html	3 May 2009 15:59:41 -0000	1.4
+++ input.date.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=date &#8211; date input control</title>
+<title>HTML5: input type=date &#8211; date input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- var.html	26 Jun 2009 15:52:54 -0000	1.5
+++ var.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>var &#8211; variable or placeholder text</title>
+<title>HTML5: var &#8211; variable or placeholder text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#var-content">#</a></h2>
         <div class="content-models" id="var-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="var-mdl" href="var.html#var-mdl" class="element">var</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sub.html	26 Jun 2009 15:52:54 -0000	1.5
+++ sub.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>sub &#8211; subscript</title>
+<title>HTML5: sub &#8211; subscript</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#sub-content">#</a></h2>
         <div class="content-models" id="sub-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="sub-mdl" href="sub.html#sub-mdl" class="element">sub</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- title.html	26 Jun 2009 15:52:54 -0000	1.5
+++ title.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>title &#8211; document title</title>
+<title>HTML5: title &#8211; document title</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pre.html	26 Jun 2009 15:52:53 -0000	1.5
+++ pre.html	29 Jun 2009 09:18:48 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>pre &#8211; preformatted text</title>
+<title>HTML5: pre &#8211; preformatted text</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#pre-content">#</a></h2>
         <div class="content-models" id="pre-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="pre-mdl" href="pre.html#pre-mdl" class="element">pre</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- button.submit.html	26 Jun 2009 15:52:52 -0000	1.8
+++ button.submit.html	29 Jun 2009 09:18:45 -0000	1.9
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>button type=submit &#8211; submit button</title>
+<title>HTML5: button type=submit &#8211; submit button</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content">#</a></h2>
         <div class="content-models" id="button.submit-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="button.submit-mdl" href="button.submit.html#button.submit-mdl"><span class="element">button</span>.submit</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rp.html	26 Jun 2009 15:52:53 -0000	1.6
+++ rp.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>rp &#8211; ruby parenthesis</title>
+<title>HTML5: rp &#8211; ruby parenthesis</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#rp-content">#</a></h2>
         <div class="content-models" id="rp-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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> = ((<a href="terminology.html#character-data">character data</a>
+        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sup.html	26 Jun 2009 15:52:54 -0000	1.5
+++ sup.html	29 Jun 2009 09:18:49 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>sup &#8211; superscript</title>
+<title>HTML5: sup &#8211; superscript</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#sup-content">#</a></h2>
         <div class="content-models" id="sup-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="sup-mdl" href="sup.html#sup-mdl" class="element">sup</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- details.html	26 Jun 2009 15:52:52 -0000	1.5
+++ details.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>details &#8211; additional on-demand information</title>
+<title>HTML5: details &#8211; additional on-demand information</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -23,7 +23,7 @@
         <div class="content-models" id="details-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="details-mdl" href="details.html#details-mdl" class="element">details</a> = </span><span>
       <a class="ref" href="legend.html#legend">legend</a>,
-  (<a href="terminology.html#character-data">character data</a>
+  (<a href="syntax.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: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.url.html	3 May 2009 15:59:42 -0000	1.4
+++ input.url.html	29 Jun 2009 09:18:47 -0000	1.5
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>input type=url &#8211; URL input control</title>
+<title>HTML5: input type=url &#8211; URL input control</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: shared-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/shared-attributes.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- shared-attributes.html	15 Jun 2009 20:27:02 -0000	1.6
+++ shared-attributes.html	29 Jun 2009 09:18:48 -0000	1.7
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>Other shared attributes</title>
+<title>HTML5: Other shared attributes</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -12,9 +12,9 @@
 <span class="nav-next"><a href="datatypes.html">datatypes &#187;</a></span>
 </div>
 <div id="shared-attributes" class="section">
-        <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2>
+        <h2>10. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2>
     <div id="shared-hyperlink-attrs" class="section">
-        <h2>9.1. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
+        <h2>10.1. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
         <dl class="attr-defs"><dt><dfn class="attribute-name" id="shared-hyperlink.attrs.href" title="shared-hyperlink.attrs.href">href</dfn><span class="attr-values"> = 
       <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
     </span><a class="hash" href="shared-attributes.html#shared-hyperlink.attrs.href">#</a></dt><dd><dd>A URL that provides the <dfn id="destination">destination resource</dfn> of the
@@ -44,7 +44,7 @@
         </dl>
     </div>
     <div id="common-form-attrs" class="section">
-        <h2>9.2. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
+        <h2>10.2. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
         <div class="content-model"><span class="common-pattern-name"><dfn id="common-form.attrs">common-form.attrs</dfn></span> = (<a class="ref" href="shared-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
    &amp; <a class="ref" href="shared-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?)
   &amp; <a class="ref" href="shared-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>? <a class="hash" href="shared-attributes.html#common-form.attrs">#</a>

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hgroup.html	5 Jun 2009 10:01:25 -0000	1.5
+++ hgroup.html	29 Jun 2009 09:18:46 -0000	1.6
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>hgroup &#8211; heading group</title>
+<title>HTML5: hgroup &#8211; heading group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- h5.html	26 Jun 2009 15:52:52 -0000	1.7
+++ h5.html	29 Jun 2009 09:18:46 -0000	1.8
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>h5 &#8211; heading (level 5)</title>
+<title>HTML5: h5 &#8211; heading (level 5)</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link>
 </head>
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#h5-content">#</a></h2>
         <div class="content-models" id="h5-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="h5-mdl" href="h5.html#h5-mdl" class="element">h5</a> = </span><span>
-      (<a href="terminology.html#character-data">character data</a>
+      (<a href="syntax.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 Monday, 29 June 2009 09:23:19 UTC

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