- From: poot <cvsmail@w3.org>
- Date: Mon, 1 Mar 2010 20:59:09 +0900 (JST)
- To: public-html-diffs@w3.org
mike: streamline the description of deprecated doctypes
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.177&r2=1.178&f=h
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- syntax.html 18 Feb 2010 20:39:19 -0000 1.36
+++ syntax.html 1 Mar 2010 11:58:48 -0000 1.37
@@ -120,56 +120,35 @@
<p>A
<dfn id="deprecated-doctype" title="deprecated-doctype">deprecated doctype</dfn>
is a
- <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>
+ <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>,
as defined in the XML specification
<a href="references.html#refsXML">[XML]</a>,
- with the further restriction that it must meet one of the
- following sets of constraints:</p>
+ whose
+ <a href="syntax.html#doctype-declaration">document type declaration’s</a>
+ name part is a
+ <a href="terminology.html#case-insensitive">case-insensitive match</a>
+ for the string
+ "<code>HTML</code>",
+ and that must one of the following sets of constraints:</p>
<ul>
- <li>The
- <a href="syntax.html#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="terminology.html#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD HTML 4.0//EN</code>",
and its system identifier is either missing or is an exact
match for the literal string
- "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>".</li>
- <li>The
- <a href="syntax.html#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="terminology.html#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD HTML 4.01//EN</code>",
and its system identifier is either missing or is an exact
match for the literal string
- "<code>http://www.w3.org/TR/html4/strict.dtd</code>".</li>
- <li>The
- <a href="syntax.html#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="terminology.html#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/html4/strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>",
- and its system identifier is either missing or is an exact
- match for the literal string
- "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li>
- <li>The
- <a href="syntax.html#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="terminology.html#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ and its system identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD XHTML 1.1//EN</code>",
- and its system identifier is either missing or is an exact
- match for the literal string
- "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>".</li>
+ and its system identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>"</li>
</ul>
<div class="example">
<p>The following are examples of some
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- spec.html 25 Feb 2010 14:37:46 -0000 1.177
+++ spec.html 1 Mar 2010 11:58:47 -0000 1.178
@@ -1156,56 +1156,35 @@
<p>A
<dfn id="deprecated-doctype" title="deprecated-doctype">deprecated doctype</dfn>
is a
- <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>
+ <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>,
as defined in the XML specification
<a href="#refsXML">[XML]</a>,
- with the further restriction that it must meet one of the
- following sets of constraints:</p>
+ whose
+ <a href="#doctype-declaration">document type declaration’s</a>
+ name part is a
+ <a href="#case-insensitive">case-insensitive match</a>
+ for the string
+ "<code>HTML</code>",
+ and that must one of the following sets of constraints:</p>
<ul>
-<li>The
- <a href="#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+<li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD HTML 4.0//EN</code>",
and its system identifier is either missing or is an exact
match for the literal string
- "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>".</li>
- <li>The
- <a href="#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD HTML 4.01//EN</code>",
and its system identifier is either missing or is an exact
match for the literal string
- "<code>http://www.w3.org/TR/html4/strict.dtd</code>".</li>
- <li>The
- <a href="#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/html4/strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>",
- and its system identifier is either missing or is an exact
- match for the literal string
- "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li>
- <li>The
- <a href="#doctype-declaration">document type declaration’s</a>
- name part is a
- <a href="#case-insensitive">case-insensitive match</a>
- for the string
- "<code>HTML</code>",
- its public identifier is an exact match for the literal string
+ and its system identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>"</li>
+ <li>its public identifier is an exact match for the literal string
"<code>-//W3C//DTD XHTML 1.1//EN</code>",
- and its system identifier is either missing or is an exact
- match for the literal string
- "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>".</li>
+ and its system identifier is an exact match for the literal string
+ "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>"</li>
</ul>
<div class="example">
<p>The following are examples of some
Received on Monday, 1 March 2010 11:59:38 UTC