- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 01 Mar 2010 11:58:50 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv15271/src
Modified Files:
syntax.html
Log Message:
streamline the description of deprecated doctypes
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- syntax.html 18 Feb 2010 20:39:19 -0000 1.75
+++ syntax.html 1 Mar 2010 11:58:48 -0000 1.76
@@ -98,56 +98,35 @@
<dfn
id="doctype-declaration"
title="doctype-declaration"
- >document type declaration</dfn>
+ >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:58:51 UTC