- From: poot <cvsmail@w3.org>
- Date: Fri, 10 Jul 2009 11:29:42 +0900 (JST)
- To: public-html-diffs@w3.org
mike: support treatment of XHTML 1.0 and HTML 4.01, etc., DOCTYPES as
things to warn about (instead of as errors)
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.46&r2=1.47&f=h
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- syntax.html 9 Jul 2009 20:31:08 -0000 1.12
+++ syntax.html 10 Jul 2009 02:29:18 -0000 1.13
@@ -48,7 +48,12 @@
<a href="syntax.html#doctype.pattern">doctype</a>
or
<a href="syntax.html#doctype.legacy">doctype.legacy</a>
- patterns defined this specification.</p>
+ patterns defined this specification, or must match the
+ definition of a
+ <code class="defined-elsewhere">doctypedecl</code>
+ (<b class="defined-elsewhere">document type declaration</b>)
+ given in the XML specification
+ <a href="references.html#refsXML">[XML]</a>.</p>
<p>The <code>doctype</code> pattern is defined as follows:</p>
<dl class="pattern-def">
<dt><a id="doctype.pattern" href="syntax.html#doctype.pattern">doctype</a> =</dt>
@@ -61,7 +66,7 @@
</dl>
<div class="example">
<p>The following are examples of some DOCTYPEs that match the
- above pattern.</p>
+ <a href="syntax.html#doctype">doctype</a> pattern.</p>
<pre><!doctype html></pre>
<pre><!DOCTYPE HTML></pre>
</div>
@@ -79,10 +84,22 @@
</dl>
<div class="example">
<p>The following are examples of some DOCTYPEs that match the
- above pattern.</p>
+ <a href=".html#doctype,legacy">doctype.legacy</a> pattern.</p>
<pre><!doctype html system 'about:legacy-compat'></pre>
<pre><!DOCTYPE HTML system "about:legacy-compat"></pre>
</div>
+ <p>The following are examples of some DOCTYPEs that match the
+ definition of a
+ <code class="defined-elsewhere">doctypedecl</code>
+ (<b class="defined-elsewhere">document type declaration</b>)
+ given in the XML specification
+ <a href="references.html#refsXML">[XML]</a>.</p>
+ <div class="example">
+ <pre><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></pre>
+ <pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd"></pre>
+ </div>
</div>
<div id="character-encoding" class="section">
<h2>6.2. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="Overview.html#character-encoding-toc">T</a></h2>
@@ -194,9 +211,12 @@
</dd>
</dl>
<p id="elements-html-syntax">The following list describes syntax
- rules for the <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>.
- Rules for the <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a> are defined in
- the XML specification <a href="references.html#refsXML">[XML]</a>.</p>
+ rules for the
+ <a href="html-and-xhtml.html#html-syntax">the HTML syntax</a>.
+ Rules for the
+ <a href="html-and-xhtml.html#xml-syntax">the XML syntax</a>
+ are defined in the XML specification
+ <a href="references.html#refsXML">[XML]</a>.</p>
<ul>
<li><dfn id="tags" title="syntax-tags">Tags</dfn> are used to
delimit the start and end of elements in the markup. Elements
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- spec.html 9 Jul 2009 20:31:07 -0000 1.46
+++ spec.html 10 Jul 2009 02:29:18 -0000 1.47
@@ -962,7 +962,12 @@
<a href="#doctype.pattern">doctype</a>
or
<a href="#doctype.legacy">doctype.legacy</a>
- patterns defined this specification.</p>
+ patterns defined this specification, or must match the
+ definition of a
+ <code class="defined-elsewhere">doctypedecl</code>
+ (<b class="defined-elsewhere">document type declaration</b>)
+ given in the XML specification
+ <a href="#refsXML">[XML]</a>.</p>
<p>The <code>doctype</code> pattern is defined as follows:</p>
<dl class="pattern-def">
<dt>
@@ -976,7 +981,7 @@
</dl>
<div class="example">
<p>The following are examples of some DOCTYPEs that match the
- above pattern.</p>
+ <a href="#doctype">doctype</a> pattern.</p>
<pre><!doctype html></pre>
<pre><!DOCTYPE HTML></pre>
</div>
@@ -995,10 +1000,22 @@
</dl>
<div class="example">
<p>The following are examples of some DOCTYPEs that match the
- above pattern.</p>
+ <a href="#doctype,legacy">doctype.legacy</a> pattern.</p>
<pre><!doctype html system 'about:legacy-compat'></pre>
<pre><!DOCTYPE HTML system "about:legacy-compat"></pre>
</div>
+ <p>The following are examples of some DOCTYPEs that match the
+ definition of a
+ <code class="defined-elsewhere">doctypedecl</code>
+ (<b class="defined-elsewhere">document type declaration</b>)
+ given in the XML specification
+ <a href="#refsXML">[XML]</a>.</p>
+ <div class="example">
+ <pre><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></pre>
+ <pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd"></pre>
+ </div>
</div>
<div id="character-encoding" class="section">
<h2>6.2. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="#character-encoding-toc">T</a>
@@ -1113,9 +1130,12 @@
</dd>
</dl>
<p id="elements-html-syntax">The following list describes syntax
- rules for the <a href="#html-syntax">the HTML syntax</a>.
- Rules for the <a href="#xml-syntax">the XML syntax</a> are defined in
- the XML specification <a href="#refsXML">[XML]</a>.</p>
+ rules for the
+ <a href="#html-syntax">the HTML syntax</a>.
+ Rules for the
+ <a href="#xml-syntax">the XML syntax</a>
+ are defined in the XML specification
+ <a href="#refsXML">[XML]</a>.</p>
<ul>
<li>
<dfn id="tags" title="syntax-tags">Tags</dfn> are used to
Received on Friday, 10 July 2009 02:30:19 UTC