[html5] r3238 - [e] (0) Revamp how the spec refers to 'HTML5', 'XHTML', etc.

whatwg at whatwg.org whatwg at whatwg.org
Fri Jun 12 16:09:09 PDT 2009


Author: ianh
Date: 2009-06-12 16:09:08 -0700 (Fri, 12 Jun 2009)
New Revision: 3238

Modified:
   index
   source
Log:
[e] (0) Revamp how the spec refers to 'HTML5', 'XHTML', etc.

Modified: index
===================================================================
--- index	2009-06-12 22:33:53 UTC (rev 3237)
+++ index	2009-06-12 23:09:08 UTC (rev 3238)
@@ -903,7 +903,7 @@
        <li><a href=#ports-and-garbage-collection><span class=secno>8.3.3.1 </span>Ports and garbage collection</a></ol></ol></ol></li>
  <li><a href=#syntax><span class=secno>9 </span>The HTML syntax</a>
   <ol>
-   <li><a href=#writing-html-documents><span class=secno>9.1 </span>Writing HTML documents</a>
+   <li><a href=#writing><span class=secno>9.1 </span>Writing HTML documents</a>
     <ol>
      <li><a href=#the-doctype><span class=secno>9.1.1 </span>The DOCTYPE</a></li>
      <li><a href=#elements-0><span class=secno>9.1.2 </span>Elements</a>
@@ -1168,8 +1168,8 @@
 
   <p><em>This section is non-normative.</em></p>
 
-  <p>Work on HTML5 originally started in late 2003, as a proof of
-  concept to show that it was possible to extend HTML4's forms to
+  <p>Work on HTML 5 originally started in late 2003, as a proof
+  of concept to show that it was possible to extend HTML4's forms to
   provide many of the features that XForms 1.0 introduced, without
   requiring browsers to implement rendering engines that were
   incompatible with existing HTML Web pages. At this early stage,
@@ -1192,10 +1192,10 @@
 
   <p>In 2006, the W3C expressed interest in the specification, and
   created a working group chartered to work with the WHATWG on the
-  development of the HTML5 specifications. The working group opened in
-  2007. Apple, Mozilla, and Opera allowed the W3C to publish the
-  specifications under the W3C copyright, while keeping versions with
-  the less restrictive license on the WHATWG site.</p>
+  development of the HTML 5 specifications. The working group
+  opened in 2007. Apple, Mozilla, and Opera allowed the W3C to publish
+  the specifications under the W3C copyright, while keeping versions
+  with the less restrictive license on the WHATWG site.</p>
 
   <p>Since then, both groups have been working together.</p>
 
@@ -1244,12 +1244,13 @@
 
   <p><em>This section is non-normative.</em></p>
 
-  <p>HTML5 interacts with and relies on a wide variety of other
-  specifications. In certain circumstances, unfortunately, the desire
-  to be compatible with legacy content has led to HTML5 violating the
-  requirements of these other specifications. Whenever this has
-  occured, the transgressions have been noted as "<dfn id=willful-violation title="willful
-  violation">willful violations</dfn>".</p>
+  <p>This specification interacts with and relies on a wide variety of
+  other specifications. In certain circumstances, unfortunately, the
+  desire to be compatible with legacy content has led to this
+  specification violating the requirements of these other
+  specifications. Whenever this has occured, the transgressions have
+  been noted as "<dfn id=willful-violation title="willful violation">willful
+  violations</dfn>".</p>
 
 
 
@@ -1492,17 +1493,12 @@
   properties. When these are ambiguous they are qualified as <dfn title="">object properties</dfn> and <dfn title="">CSS properties</dfn>
   respectively.</p>
 
-  <p>The term <a href=#html-documents>HTML documents</a> is sometimes used in
-  contrast with <a href=#xml-documents>XML documents</a> to specifically mean
-  documents that were parsed using an <a href=#html-parser>HTML parser</a> (as
-  opposed to using an <a href=#xml-parser>XML parser</a> or created purely
-  through the DOM).</p>
-
   <p>Generally, when the specification states that a feature applies
-  to HTML or XHTML, it also includes the other. When a feature
-  specifically only applies to one of the two languages, it is called
-  out by explicitly stating that it does not apply to the other
-  format, as in "for HTML, ... (this does not apply to XHTML)".</p>
+  to <a href=#syntax>the HTML syntax</a> or <a href=#the-xhtml-syntax>the XHTML syntax</a>, it
+  also includes the other. When a feature specifically only applies to
+  one of the two languages, it is called out by explicitly stating
+  that it does not apply to the other format, as in "for HTML,
+  ... (this does not apply to XHTML)".</p>
 
   <p>This specification uses the term <dfn title="">document</dfn> to
   refer to any use of HTML, ranging from short static documents to
@@ -1721,11 +1717,12 @@
 
    <dd>
 
-    <p>Web browsers that support <a href=#xhtml5>XHTML</a> must process
-    elements and attributes from the <a href=#html-namespace-0>HTML namespace</a> found
-    in <a href=#xml-documents>XML documents</a> as described in this specification,
-    so that users can interact with them, unless the semantics of
-    those elements have been overridden by other specifications.</p>
+    <p>Web browsers that support <a href=#the-xhtml-syntax>the XHTML syntax</a> must
+    process elements and attributes from the <a href=#html-namespace-0>HTML
+    namespace</a> found in XML documents as described in this
+    specification, so that users can interact with them, unless the
+    semantics of those elements have been overridden by other
+    specifications.</p>
 
     <p class=example>A conforming XHTML processor would, upon
     finding an XHTML <code><a href=#script>script</a></code> element in an XML document,
@@ -1735,7 +1732,7 @@
     would instead treat the <code><a href=#script>script</a></code> element as an opaque
     element that forms part of the transform.</p>
 
-    <p>Web browsers that support <a href=#html5 title=HTML5>HTML</a> must
+    <p>Web browsers that support <a href=#syntax>the HTML syntax</a> must
     process documents labeled as <code>text/html</code> as described
     in this specification, so that users can interact with them.</p>
 
@@ -1938,23 +1935,22 @@
 
   <p>For compatibility with existing content and prior specifications,
   this specification describes two authoring formats: one based on XML
-  (referred to as <dfn id=xhtml5 title=XHTML>XHTML5</dfn>), and
-  one using a <a href=#parsing>custom format</a> inspired by SGML
-  (referred to as <dfn id=html5>HTML5</dfn>). <span class=impl>Implementations may support only one of these two
-  formats, although supporting both is encouraged.</span></p>
+  (referred to as <a href=#the-xhtml-syntax>the XHTML syntax</a>), and one using a <a href=#writing>custom format</a> inspired by SGML (referred to as
+  <a href=#syntax>the HTML syntax</a>). <span class=impl>Implementations
+  may support only one of these two formats, although supporting both
+  is encouraged.</span></p>
 
-  <p id=authors-using-xhtml><a href=#xhtml5>XHTML</a> documents (<a href=#xml-documents>XML
-  documents</a> using elements from the <a href=#html-namespace-0>HTML
-  namespace</a>) that use the new features described in this
-  specification and that are served over the wire (e.g. by HTTP) must
-  be sent using an XML MIME type such as <code>application/xml</code>
-  or <code>application/xhtml+xml</code> and must not be served as
+  <p id=authors-using-xhtml>XML documents that use elements or
+  attributes from the <a href=#html-namespace-0>HTML namespace</a> and that are served
+  over the wire (e.g. by HTTP) must be sent using an XML MIME type
+  such as <code>application/xml</code> or
+  <code>application/xhtml+xml</code> and must not be served as
   <code>text/html</code>. <a href=#refsRFC3023>[RFC3023]</a></p>
 
-  <p id=authors-using-html><a href=#html5 title=HTML5>HTML
-  documents</a>, if they are served over the wire (e.g. by HTTP)
-  must be labeled with the <code>text/html</code> MIME type.</p> <!--
-  XXX update RFC 2854 -->
+  <p id=authors-using-html>Documents that use <a href=#syntax>the HTML
+  syntax</a>, if they are served over the wire (e.g. by HTTP) must
+  be labeled with the <code>text/html</code> MIME type.</p> <!-- XXX
+  update RFC 2854 -->
 
   <p class=impl id=entity-references>The language in this
   specification assumes that the user agent expands all entity
@@ -1981,9 +1977,10 @@
 
    <dd>
 
-    <p>Implementations that support XHTML5 must support some version
-    of XML, as well as its corresponding namespaces specification,
-    because XHTML5 uses an XML serialization with namespaces. <a href=#refsXML>[XML]</a> <a href=#refsXMLNAMES>[XMLNAMES]</a></p>
+    <p>Implementations that support <a href=#the-xhtml-syntax>the XHTML syntax</a> must
+    support some version of XML, as well as its corresponding
+    namespaces specification, because that syntax uses an XML
+    serialization with namespaces. <a href=#refsXML>[XML]</a> <a href=#refsXMLNAMES>[XMLNAMES]</a></p>
 
    </dd>
 
@@ -2279,10 +2276,10 @@
 
   <h4 id=boolean-attributes><span class=secno>2.4.2 </span>Boolean attributes</h4>
 
-  <p>A number of attributes in HTML5 are <dfn id=boolean-attribute title="boolean
-  attribute">boolean attributes</dfn>. The presence of a boolean
-  attribute on an element represents the true value, and the absence
-  of the attribute represents the false value.</p>
+  <p>A number of attributes are <dfn id=boolean-attribute title="boolean attribute">boolean
+  attributes</dfn>. The presence of a boolean attribute on an element
+  represents the true value, and the absence of the attribute
+  represents the false value.</p>
 
   <p>If the attribute is present, its value must either be the empty
   string or a value that is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a>
@@ -2795,7 +2792,7 @@
 
 <div class=impl>
   <h5 id=percentages-and-dimensions><span class=secno>2.4.4.5 </span>Percentages and lengths</h5>
-<!--(percentages are not used in valid html5)
+<!--(percentages are not used in valid html anymore)
   <p>A string is a <dfn>valid dimension value</dfn> if it consists of
   a character in the range U+0031 DIGIT ONE (1) to U+0039 DIGIT NINE
   (9), optionally followed by zero of more characters in the range
@@ -10186,7 +10183,7 @@
   <p>The <dfn id=attr-meta-charset title=attr-meta-charset><code>charset</code></dfn>
   attribute specifies the character encoding used by the
   document. This is a <a href=#character-encoding-declaration>character encoding declaration</a>. If
-  the attribute is present in an <a href=#xhtml5 title=XHTML>XML
+  the attribute is present in an <a href=#xml-documents title="XML documents">XML
   document</a>, its value must be an <a href=#ascii-case-insensitive>ASCII
   case-insensitive</a> match for the string "<code title="">UTF-8</code>" (and the document is therefore required to
   use UTF-8 as its encoding).</p>
@@ -10511,9 +10508,9 @@
     <code><a href=#meta>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
 
     <p>The <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
-    declaration state</a> may be used in <a href=#html5 title=HTML5>HTML
-    documents</a> only, elements in that state must not be used in
-    <a href=#xhtml5 title=XHTML>XML documents</a>.</p>
+    declaration state</a> may be used in <a href=#html-documents>HTML
+    documents</a>, but elements in that state must not be used in
+    <a href=#xml-documents>XML documents</a>.</p>
 
    </dd>
 
@@ -14764,7 +14761,7 @@
    use the <code><a href=#the-abbr-element>abbr</a></code> element.</p>
    <pre><p>The
 <abbr title="Web Hypertext Application Technology Working Group">WHATWG</abbr>
-started working on HTML5 in 2004.</p></pre>
+started working on HTML 5 in 2004.</p></pre>
   </div>
 
   <div class=example>
@@ -16057,7 +16054,7 @@
    in marking up the lede (or lead) sentence or paragraph. The
    following example shows how a <a href=http://news.bbc.co.uk/2/hi/uk_news/scotland/north_east/7101506.stm>BBC
    article about kittens adopting a rabbit as their own</a> could be
-   marked up using HTML5 elements:</p>
+   marked up:</p>
    <pre><article>
  <h2>Kittens 'adopted' by pet rabbit</h2>
  <p><b>Six abandoned kittens have found an unexpected new
@@ -42752,7 +42749,7 @@
   var stamp = new Date();
   var stampString = '' + stamp.getUTCFullYear() + (stamp.getUTCMonth() + 1) + stamp.getUTCDate() + 'T' +
                          stamp.getUTCHours() + stamp.getUTCMinutes() + stamp.getUTCSeconds() + 'Z';
-  var calendar = 'BEGIN:VCALENDAR\r\nPRODID:HTML5\r\nVERSION:2.0\r\nBEGIN:VEVENT\r\nDTSTAMP:' + stampString + '\r\n';
+  var calendar = 'BEGIN:VCALENDAR\r\nPRODID:HTML\r\nVERSION:2.0\r\nBEGIN:VEVENT\r\nDTSTAMP:' + stampString + '\r\n';
   for (var propIndex = 0; propIndex < node.properties.length; propIndex += 1) {
     var prop = node.properties[propIndex];
     var value = prop.content;
@@ -47613,10 +47610,11 @@
     <tr><td><dfn id=handler-onvolumechange title=handler-onvolumechange><code>onvolumechange</code></dfn> <td> <code title=event-volumechange><a href=#event-volumechange>volumechange</a></code>
     <tr><td><dfn id=handler-onwaiting title=handler-onwaiting><code>onwaiting</code></dfn> <td> <code title=event-waiting><a href=#event-waiting>waiting</a></code>
 
-<!-- not supported in HTML5: -->
+<!-- not supported, use dnd: -->
 <!--<tr><td><dfn title="handler-onbeforecopy"><code>onbeforecopy</code></dfn> <td> <code title="event-beforecopy">beforecopy</code>--> <!-- widely used -->
 <!--<tr><td><dfn title="handler-oncopy"><code>oncopy</code></dfn> <td> <code title="event-copy">copy</code>--> <!-- widely used -->
 <!--<tr><td><dfn title="handler-onpaste"><code>onpaste</code></dfn> <td> <code title="event-paste">paste</code>--> <!-- widely used -->
+<!-- not supported yet (v2?): -->
 <!--<tr><td><dfn title="handler-onselectstart"><code>onselectstart</code></dfn> <td> <code title="event-selectstart">selectstart</code>--> <!-- widely used -->
   </table><hr><p>The following are the <a href=#event-handler-attributes-0>event handler attributes</a> (and
   their corresponding <a href=#event-handler-event-type title="event handler event type">event
@@ -56822,9 +56820,9 @@
    <dd class=impl>
     <p><strong>Action:</strong> The user agent must run the following
     steps:</p>
-    <ol><li><p>If the document is an <span>XML document</span>, then
-     throw an <code><a href=#invalid_access_err>INVALID_ACCESS_ERR</a></code> exception and abort
-     these steps.</li><!-- v2 support XML? -->
+    <ol><li><p>If the document is an <a href=#xml-documents title="XML documents">XML
+     document</a>, then throw an <code><a href=#invalid_access_err>INVALID_ACCESS_ERR</a></code>
+     exception and abort these steps.</li><!-- v2 support XML? -->
      <li><p>If the <var title="">value</var> argument wasn't
      specified, abort these steps without doing anything.</li>
      <li><p>If there is a selection, act as if the user had requested
@@ -57901,7 +57899,7 @@
   discussed in the section below entitled "<a href=#the-xhtml-syntax>The XHTML
   syntax</a>".</p>
 
-  <h3 id=writing-html-documents><span class=secno>9.1 </span>Writing HTML documents</h3>
+  <h3 id=writing><span class=secno>9.1 </span>Writing HTML documents</h3>
 
   <div class=impl>
 
@@ -58662,9 +58660,9 @@
   <p><em>This section only applies to user agents, data mining tools,
   and conformance checkers.</em></p>
 
-  <p>The rules for parsing <a href=#xml-documents>XML documents</a> (and thus
-  <a href=#xhtml5>XHTML</a> documents) into DOM trees are covered by the next
-  section, entitled "<a href=#the-xhtml-syntax>The XHTML syntax</a>".</p>
+  <p class=note>The rules for parsing XML documents into DOM trees
+  are covered by the next section, entitled "<a href=#the-xhtml-syntax>The XHTML
+  syntax</a>".</p>
 
   <p>For <a href=#html-documents>HTML documents</a>, user agents must use the parsing
   rules described in this section to generate the DOM trees. Together,
@@ -58673,8 +58671,9 @@
 
   <div class=note>
 
-   <p>While the HTML form of HTML5 bears a close resemblance to SGML
-   and XML, it is a separate language with its own parsing rules.</p>
+   <p>While the HTML syntax described in this specification bears a
+   close resemblance to SGML and XML, it is a separate language with
+   its own parsing rules.</p>
 
    <p>Some earlier versions of HTML (in particular from HTML2 to
    HTML4) were based on SGML and used SGML parsing rules. However, few
@@ -58689,7 +58688,7 @@
 
    <p>Authors interested in using SGML tools in their authoring
    pipeline are encouraged to use XML tools and the XML serialization
-   of HTML5.</p>
+   of HTML.</p>
 
   </div>
 
@@ -58716,7 +58715,11 @@
   the other conformance requirements described in this
   specification.</p>
 
+  <p>For the purposes of conformance checkers, if a resource is
+  determined to be in <a href=#syntax>the HTML syntax</a>, then it is an
+  <a href=#html-documents title="HTML documents">HTML document</a>.</p>
 
+
   <h4 id=overview-of-the-parsing-model><span class=secno>9.2.1 </span>Overview of the parsing model</h4>
 
   <p>The input to the HTML parsing process consists of a stream of
@@ -67409,8 +67412,12 @@
   must <a href=#stop-parsing>stop parsing</a>, following the same rules as the
   <a href=#html-parser>HTML parser</a>.</p>
 
+  <p>For the purposes of conformance checkers, if a resource is
+  determined to be in <a href=#the-xhtml-syntax>the XHTML syntax</a>, then it is an
+  <a href=#xml-documents title="XML documents">XML document</a>.</p>
 
 
+
   <h3 id=serializing-xhtml-fragments><span class=secno>10.3 </span>Serializing XHTML fragments</h3>
 
   <p>The <dfn id=xml-fragment-serialization-algorithm>XML fragment serialization algorithm</dfn> for a
@@ -69761,9 +69768,9 @@
   <h4 id=the-applet-element><span class=secno>12.1.1 </span>The <dfn><code>applet</code></dfn> element</h4>
 
   <p>The <code><a href=#the-applet-element>applet</a></code> element is a Java-specific variant of the
-  <code><a href=#the-embed-element>embed</a></code> element. In HTML5 the <code><a href=#the-applet-element>applet</a></code> element
-  is obsoleted so that all extension frameworks (Java, .NET, Flash,
-  etc) are handled in a consistent manner.</p>
+  <code><a href=#the-embed-element>embed</a></code> element. The <code><a href=#the-applet-element>applet</a></code> element is now
+  obsoleted so that all extension frameworks (Java, .NET, Flash, etc)
+  are handled in a consistent manner.</p>
 
   <p id=sandboxPluginApplet>When the <a href=#sandboxed-plugins-browsing-context-flag>sandboxed plugins
   browsing context flag</a> is set on the <a href=#browsing-context>browsing
@@ -70735,8 +70742,8 @@
   for their useful comments, both large and small, that have led to
   changes to this specification over the years.</p>
 
-  <p>Thanks also to everyone who has ever posted about HTML5 to their
-  blogs, public mailing lists, or forums, including the <a href=http://lists.w3.org/Archives/Public/public-html/>W3C
+  <p>Thanks also to everyone who has ever posted about HTML 5 to
+  their blogs, public mailing lists, or forums, including the <a href=http://lists.w3.org/Archives/Public/public-html/>W3C
   public-html list</a> and the <a href=http://www.whatwg.org/mailing-list>various WHATWG lists</a>.
 
   <p>Special thanks to Richard Williamson for creating the first
@@ -70825,8 +70832,6 @@
          <pav> the html spec should say what to do with it
  XXX * <title site="" publisher="" author="">Page Title</title> ?
  XXX * [onclick] should make element focusable; enter should send onclick ?
- XXX * how to interpret an HTML5 document for syndication
-       http://hixie.ch/specs/hsf/hsf
  XXX * should have some text talking about the fact that it's ok if your
        page passes through a period of non-conformance while script is
        running, but that in between scripts it should be compliant.

Modified: source
===================================================================
--- source	2009-06-12 22:33:53 UTC (rev 3237)
+++ source	2009-06-12 23:09:08 UTC (rev 3238)
@@ -103,8 +103,8 @@
 
   <p><em>This section is non-normative.</em></p>
 
-  <p>Work on HTML5 originally started in late 2003, as a proof of
-  concept to show that it was possible to extend HTML4's forms to
+  <p>Work on HTML 5 originally started in late 2003, as a proof
+  of concept to show that it was possible to extend HTML4's forms to
   provide many of the features that XForms 1.0 introduced, without
   requiring browsers to implement rendering engines that were
   incompatible with existing HTML Web pages. At this early stage,
@@ -127,10 +127,10 @@
 
   <p>In 2006, the W3C expressed interest in the specification, and
   created a working group chartered to work with the WHATWG on the
-  development of the HTML5 specifications. The working group opened in
-  2007. Apple, Mozilla, and Opera allowed the W3C to publish the
-  specifications under the W3C copyright, while keeping versions with
-  the less restrictive license on the WHATWG site.</p>
+  development of the HTML 5 specifications. The working group
+  opened in 2007. Apple, Mozilla, and Opera allowed the W3C to publish
+  the specifications under the W3C copyright, while keeping versions
+  with the less restrictive license on the WHATWG site.</p>
 
   <p>Since then, both groups have been working together.</p>
 
@@ -181,12 +181,13 @@
 
   <p><em>This section is non-normative.</em></p>
 
-  <p>HTML5 interacts with and relies on a wide variety of other
-  specifications. In certain circumstances, unfortunately, the desire
-  to be compatible with legacy content has led to HTML5 violating the
-  requirements of these other specifications. Whenever this has
-  occured, the transgressions have been noted as "<dfn title="willful
-  violation">willful violations</dfn>".</p>
+  <p>This specification interacts with and relies on a wide variety of
+  other specifications. In certain circumstances, unfortunately, the
+  desire to be compatible with legacy content has led to this
+  specification violating the requirements of these other
+  specifications. Whenever this has occured, the transgressions have
+  been noted as "<dfn title="willful violation">willful
+  violations</dfn>".</p>
 
 
 
@@ -449,17 +450,12 @@
   title="">object properties</dfn> and <dfn title="">CSS properties</dfn>
   respectively.</p>
 
-  <p>The term <span>HTML documents</span> is sometimes used in
-  contrast with <span>XML documents</span> to specifically mean
-  documents that were parsed using an <span>HTML parser</span> (as
-  opposed to using an <span>XML parser</span> or created purely
-  through the DOM).</p>
-
   <p>Generally, when the specification states that a feature applies
-  to HTML or XHTML, it also includes the other. When a feature
-  specifically only applies to one of the two languages, it is called
-  out by explicitly stating that it does not apply to the other
-  format, as in "for HTML, ... (this does not apply to XHTML)".</p>
+  to <span>the HTML syntax</span> or <span>the XHTML syntax</span>, it
+  also includes the other. When a feature specifically only applies to
+  one of the two languages, it is called out by explicitly stating
+  that it does not apply to the other format, as in "for HTML,
+  ... (this does not apply to XHTML)".</p>
 
   <p>This specification uses the term <dfn title="">document</dfn> to
   refer to any use of HTML, ranging from short static documents to
@@ -696,11 +692,12 @@
 
    <dd>
 
-    <p>Web browsers that support <span>XHTML</span> must process
-    elements and attributes from the <span>HTML namespace</span> found
-    in <span>XML documents</span> as described in this specification,
-    so that users can interact with them, unless the semantics of
-    those elements have been overridden by other specifications.</p>
+    <p>Web browsers that support <span>the XHTML syntax</span> must
+    process elements and attributes from the <span>HTML
+    namespace</span> found in XML documents as described in this
+    specification, so that users can interact with them, unless the
+    semantics of those elements have been overridden by other
+    specifications.</p>
 
     <p class="example">A conforming XHTML processor would, upon
     finding an XHTML <code>script</code> element in an XML document,
@@ -710,7 +707,7 @@
     would instead treat the <code>script</code> element as an opaque
     element that forms part of the transform.</p>
 
-    <p>Web browsers that support <span title="HTML5">HTML</span> must
+    <p>Web browsers that support <span>the HTML syntax</span> must
     process documents labeled as <code>text/html</code> as described
     in this specification, so that users can interact with them.</p>
 
@@ -924,24 +921,23 @@
 
   <p>For compatibility with existing content and prior specifications,
   this specification describes two authoring formats: one based on XML
-  (referred to as <dfn id="xhtml5" title="XHTML">XHTML5</dfn>), and
-  one using a <a href="#parsing">custom format</a> inspired by SGML
-  (referred to as <dfn id="html5">HTML5</dfn>). <span
-  class="impl">Implementations may support only one of these two
-  formats, although supporting both is encouraged.</span></p>
+  (referred to as <span>the XHTML syntax</span>), and one using a <a
+  href="#writing">custom format</a> inspired by SGML (referred to as
+  <span>the HTML syntax</span>). <span class="impl">Implementations
+  may support only one of these two formats, although supporting both
+  is encouraged.</span></p>
 
-  <p id="authors-using-xhtml"><span>XHTML</span> documents (<span>XML
-  documents</span> using elements from the <span>HTML
-  namespace</span>) that use the new features described in this
-  specification and that are served over the wire (e.g. by HTTP) must
-  be sent using an XML MIME type such as <code>application/xml</code>
-  or <code>application/xhtml+xml</code> and must not be served as
+  <p id="authors-using-xhtml">XML documents that use elements or
+  attributes from the <span>HTML namespace</span> and that are served
+  over the wire (e.g. by HTTP) must be sent using an XML MIME type
+  such as <code>application/xml</code> or
+  <code>application/xhtml+xml</code> and must not be served as
   <code>text/html</code>. <a href="#refsRFC3023">[RFC3023]</a></p>
 
-  <p id="authors-using-html"><span title="HTML5">HTML
-  documents</span>, if they are served over the wire (e.g. by HTTP)
-  must be labeled with the <code>text/html</code> MIME type.</p> <!--
-  XXX update RFC 2854 -->
+  <p id="authors-using-html">Documents that use <span>the HTML
+  syntax</span>, if they are served over the wire (e.g. by HTTP) must
+  be labeled with the <code>text/html</code> MIME type.</p> <!-- XXX
+  update RFC 2854 -->
 
   <p id="entity-references" class="impl">The language in this
   specification assumes that the user agent expands all entity
@@ -970,10 +966,10 @@
 
    <dd>
 
-    <p>Implementations that support XHTML5 must support some version
-    of XML, as well as its corresponding namespaces specification,
-    because XHTML5 uses an XML serialization with namespaces. <a
-    href="#refsXML">[XML]</a> <a
+    <p>Implementations that support <span>the XHTML syntax</span> must
+    support some version of XML, as well as its corresponding
+    namespaces specification, because that syntax uses an XML
+    serialization with namespaces. <a href="#refsXML">[XML]</a> <a
     href="#refsXMLNAMES">[XMLNAMES]</a></p>
 
    </dd>
@@ -1297,10 +1293,10 @@
 
   <h4>Boolean attributes</h4>
 
-  <p>A number of attributes in HTML5 are <dfn title="boolean
-  attribute">boolean attributes</dfn>. The presence of a boolean
-  attribute on an element represents the true value, and the absence
-  of the attribute represents the false value.</p>
+  <p>A number of attributes are <dfn title="boolean attribute">boolean
+  attributes</dfn>. The presence of a boolean attribute on an element
+  represents the true value, and the absence of the attribute
+  represents the false value.</p>
 
   <p>If the attribute is present, its value must either be the empty
   string or a value that is an <span>ASCII case-insensitive</span>
@@ -1930,7 +1926,7 @@
 
 <div class="impl">
   <h5 id="percentages-and-dimensions">Percentages and lengths</h5>
-<!--(percentages are not used in valid html5)
+<!--(percentages are not used in valid html anymore)
   <p>A string is a <dfn>valid dimension value</dfn> if it consists of
   a character in the range U+0031 DIGIT ONE (1) to U+0039 DIGIT NINE
   (9), optionally followed by zero of more characters in the range
@@ -10566,7 +10562,7 @@
   <p>The <dfn title="attr-meta-charset"><code>charset</code></dfn>
   attribute specifies the character encoding used by the
   document. This is a <span>character encoding declaration</span>. If
-  the attribute is present in an <span title="XHTML">XML
+  the attribute is present in an <span title="XML documents">XML
   document</span>, its value must be an <span>ASCII
   case-insensitive</span> match for the string "<code
   title="">UTF-8</code>" (and the document is therefore required to
@@ -10938,9 +10934,9 @@
     title="attr-meta-charset">charset</code> attribute present.</p>
 
     <p>The <span title="attr-meta-http-equiv-content-type">Encoding
-    declaration state</span> may be used in <span title="HTML5">HTML
-    documents</span> only, elements in that state must not be used in
-    <span title="XHTML">XML documents</span>.</p>
+    declaration state</span> may be used in <span>HTML
+    documents</span>, but elements in that state must not be used in
+    <span>XML documents</span>.</p>
 
    </dd>
 
@@ -15660,7 +15656,7 @@
    use the <code>abbr</code> element.</p>
    <pre><p>The
 <abbr title="Web Hypertext Application Technology Working Group">WHATWG</abbr>
-started working on HTML5 in 2004.</p></pre>
+started working on HTML 5 in 2004.</p></pre>
   </div>
 
   <div class="example">
@@ -17095,7 +17091,7 @@
    following example shows how a <a
    href="http://news.bbc.co.uk/2/hi/uk_news/scotland/north_east/7101506.stm">BBC
    article about kittens adopting a rabbit as their own</a> could be
-   marked up using HTML5 elements:</p>
+   marked up:</p>
    <pre><article>
  <h2>Kittens 'adopted' by pet rabbit</h2>
  <p><b>Six abandoned kittens have found an unexpected new
@@ -48249,7 +48245,7 @@
   var stamp = new Date();
   var stampString = '' + stamp.getUTCFullYear() + (stamp.getUTCMonth() + 1) + stamp.getUTCDate() + 'T' +
                          stamp.getUTCHours() + stamp.getUTCMinutes() + stamp.getUTCSeconds() + 'Z';
-  var calendar = 'BEGIN:VCALENDAR\r\nPRODID:HTML5\r\nVERSION:2.0\r\nBEGIN:VEVENT\r\nDTSTAMP:' + stampString + '\r\n';
+  var calendar = 'BEGIN:VCALENDAR\r\nPRODID:HTML\r\nVERSION:2.0\r\nBEGIN:VEVENT\r\nDTSTAMP:' + stampString + '\r\n';
   for (var propIndex = 0; propIndex < node.properties.length; propIndex += 1) {
     var prop = node.properties[propIndex];
     var value = prop.content;
@@ -54204,10 +54200,11 @@
     <tr><td><dfn title="handler-onvolumechange"><code>onvolumechange</code></dfn> <td> <code title="event-volumechange">volumechange</code>
     <tr><td><dfn title="handler-onwaiting"><code>onwaiting</code></dfn> <td> <code title="event-waiting">waiting</code>
 
-<!-- not supported in HTML5: -->
+<!-- not supported, use dnd: -->
 <!--<tr><td><dfn title="handler-onbeforecopy"><code>onbeforecopy</code></dfn> <td> <code title="event-beforecopy">beforecopy</code>--> <!-- widely used -->
 <!--<tr><td><dfn title="handler-oncopy"><code>oncopy</code></dfn> <td> <code title="event-copy">copy</code>--> <!-- widely used -->
 <!--<tr><td><dfn title="handler-onpaste"><code>onpaste</code></dfn> <td> <code title="event-paste">paste</code>--> <!-- widely used -->
+<!-- not supported yet (v2?): -->
 <!--<tr><td><dfn title="handler-onselectstart"><code>onselectstart</code></dfn> <td> <code title="event-selectstart">selectstart</code>--> <!-- widely used -->
   </table>
 
@@ -66581,9 +66578,9 @@
     <p><strong>Action:</strong> The user agent must run the following
     steps:</p>
     <ol>
-     <li><p>If the document is an <span>XML document</span>, then
-     throw an <code>INVALID_ACCESS_ERR</code> exception and abort
-     these steps.</p></li><!-- v2 support XML? -->
+     <li><p>If the document is an <span title="XML documents">XML
+     document</span>, then throw an <code>INVALID_ACCESS_ERR</code>
+     exception and abort these steps.</p></li><!-- v2 support XML? -->
      <li><p>If the <var title="">value</var> argument wasn't
      specified, abort these steps without doing anything.</p></li>
      <li><p>If there is a selection, act as if the user had requested
@@ -68398,12 +68395,12 @@
   <p>Objects implementing the <code
   title="worker-Navigator">Navigator</code> interface must also
   implement the <span>NavigatorID</span> and
-  <span>NavigatorOnLine</span> interfaces specified in the HTML5
-  specification. <a href="#refsHTML5">[HTML5]</a></p>
+  <span>NavigatorOnLine</span> interfaces. <a
+  href="#refsHTML5">[HTML5]</a></p>
 
   <p class="note">The <code title="worker-Navigator">Navigator</code>
   interface defined in this specification is different than the one
-  defined in the HTML5 specification.</p>
+  defined in the HTML specification.</p>
 
 
 
@@ -71295,7 +71292,7 @@
   discussed in the section below entitled "<span>The XHTML
   syntax</span>".</p>
 
-  <h3>Writing HTML documents</h3>
+  <h3 id="writing">Writing HTML documents</h3>
 
   <div class="impl">
 
@@ -72141,9 +72138,9 @@
   <p><em>This section only applies to user agents, data mining tools,
   and conformance checkers.</em></p>
 
-  <p>The rules for parsing <span>XML documents</span> (and thus
-  <span>XHTML</span> documents) into DOM trees are covered by the next
-  section, entitled "<span>The XHTML syntax</span>".</p>
+  <p class="note">The rules for parsing XML documents into DOM trees
+  are covered by the next section, entitled "<span>The XHTML
+  syntax</span>".</p>
 
   <p>For <span>HTML documents</span>, user agents must use the parsing
   rules described in this section to generate the DOM trees. Together,
@@ -72152,8 +72149,9 @@
 
   <div class="note">
 
-   <p>While the HTML form of HTML5 bears a close resemblance to SGML
-   and XML, it is a separate language with its own parsing rules.</p>
+   <p>While the HTML syntax described in this specification bears a
+   close resemblance to SGML and XML, it is a separate language with
+   its own parsing rules.</p>
 
    <p>Some earlier versions of HTML (in particular from HTML2 to
    HTML4) were based on SGML and used SGML parsing rules. However, few
@@ -72168,7 +72166,7 @@
 
    <p>Authors interested in using SGML tools in their authoring
    pipeline are encouraged to use XML tools and the XML serialization
-   of HTML5.</p>
+   of HTML.</p>
 
   </div>
 
@@ -72195,7 +72193,11 @@
   the other conformance requirements described in this
   specification.</p>
 
+  <p>For the purposes of conformance checkers, if a resource is
+  determined to be in <span>the HTML syntax</span>, then it is an
+  <span title="HTML documents">HTML document</span>.</p>
 
+
   <h4>Overview of the parsing model</h4>
 
   <p>The input to the HTML parsing process consists of a stream of
@@ -79523,8 +79525,12 @@
   must <span>stop parsing</span>, following the same rules as the
   <span>HTML parser</span>.</p>
 
+  <p>For the purposes of conformance checkers, if a resource is
+  determined to be in <span>the XHTML syntax</span>, then it is an
+  <span title="XML documents">XML document</span>.</p>
 
 
+
   <h3>Serializing XHTML fragments</h3>
 
   <p>The <dfn>XML fragment serialization algorithm</dfn> for a
@@ -82225,9 +82231,9 @@
   <h4>The <dfn><code>applet</code></dfn> element</h4>
 
   <p>The <code>applet</code> element is a Java-specific variant of the
-  <code>embed</code> element. In HTML5 the <code>applet</code> element
-  is obsoleted so that all extension frameworks (Java, .NET, Flash,
-  etc) are handled in a consistent manner.</p>
+  <code>embed</code> element. The <code>applet</code> element is now
+  obsoleted so that all extension frameworks (Java, .NET, Flash, etc)
+  are handled in a consistent manner.</p>
 
   <p id="sandboxPluginApplet">When the <span>sandboxed plugins
   browsing context flag</span> is set on the <span>browsing
@@ -83342,8 +83348,8 @@
   for their useful comments, both large and small, that have led to
   changes to this specification over the years.</p>
 
-  <p>Thanks also to everyone who has ever posted about HTML5 to their
-  blogs, public mailing lists, or forums, including the <a
+  <p>Thanks also to everyone who has ever posted about HTML 5 to
+  their blogs, public mailing lists, or forums, including the <a
   href="http://lists.w3.org/Archives/Public/public-html/">W3C
   public-html list</a> and the <a
   href="http://www.whatwg.org/mailing-list">various WHATWG lists</a>.
@@ -83435,8 +83441,6 @@
          <pav> the html spec should say what to do with it
  XXX * <title site="" publisher="" author="">Page Title</title> ?
  XXX * [onclick] should make element focusable; enter should send onclick ?
- XXX * how to interpret an HTML5 document for syndication
-       http://hixie.ch/specs/hsf/hsf
  XXX * should have some text talking about the fact that it's ok if your
        page passes through a period of non-conformance while script is
        running, but that in between scripts it should be compliant.




More information about the Commit-Watchers mailing list