- From: poot <cvsmail@w3.org>
- Date: Fri, 5 Mar 2010 17:53:48 +0900 (JST)
- To: public-html-diffs@w3.org
mike: simplify/clarify description of what a conformant XML/XHTML
document is (thx=SimonPieters)
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.193&r2=1.194&f=h
===================================================================
RCS file: /sources/public/html5/markup/documents.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- documents.html 5 Mar 2010 02:19:38 -0000 1.18
+++ documents.html 5 Mar 2010 08:53:36 -0000 1.19
@@ -74,11 +74,11 @@
is defined by rules in the XML specification
<a href="references.html#refsXML">[XML]</a>
and in the Namespaces in XML 1.0 specification
- <a href="references.html#refsXML">[XMLNS]</a>.
- Beyond the requirements defined in those specifications,
- this specification does not define any additional syntax-level
- requirements for
- <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
+ <a href="references.html#refsXML">[XMLNS]</a>;
+ any syntax-level requirements for
+ <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>
+ described in this specification are intended to be the same as
+ those defined in the XML specification.</p>
</div>
<div id="mime-types" class="section">
<h2>3.02. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="Overview.html#mime-types-toc">T</a>
@@ -139,24 +139,19 @@
<p>A conformant
<dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn>
must be a
- <dfn id="well-formed-xml-document">well-formed XML document</dfn>,
- as defined in the XML specification <a href="references.html#refsXML">[XML]</a>,
+ <dfn id="namespace-well-formed-xml-document">namespace-well-formed</dfn>
+ XML document, as defined in the Namespaces in XML 1.0 specification
+ <a href="references.html#refsXML">[XMLNS]</a>,
and its
- <dfn id="root-element">root element</dfn>,
- as defined in the XML specification <a href="references.html#refsXML">[XML]</a>,
+ <dfn id="root-element">root element</dfn>
must be an
<a href="html.html#html" class="element">html</a> element.</p>
- <p>Documents in the XML syntax must conform to XML constraints
- as defined in the XML specification
- <a href="references.html#refsXML">[XML]</a>
- and in the Namespaces in XML 1.0 specification
- <a href="references.html#refsXML">[XMLNS]</a>
- — including XML well-formedness constraints — and must not
- make use of any features of the
+ <p class="note">
+ Documents in the XML syntax must not make use of any features
+ of the
<a href="documents.html#html-syntax">HTML syntax</a>
- that do not follow XML
- well-formedness constraints (for example, documents in the XML
- syntax must not use
+ that do not follow XML well-formedness constraints (for
+ example, documents in the XML syntax must not use
<a href="syntax.html#syntax-attr-unquoted">unquoted attribute value syntax</a>
and must not
<a href="syntax.html#omitted">omit tags</a>).</p>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- spec.html 5 Mar 2010 08:08:46 -0000 1.193
+++ spec.html 5 Mar 2010 08:53:36 -0000 1.194
@@ -886,11 +886,11 @@
is defined by rules in the XML specification
<a href="#refsXML">[XML]</a>
and in the Namespaces in XML 1.0 specification
- <a href="#refsXML">[XMLNS]</a>.
- Beyond the requirements defined in those specifications,
- this specification does not define any additional syntax-level
- requirements for
- <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
+ <a href="#refsXML">[XMLNS]</a>;
+ any syntax-level requirements for
+ <a href="#syntax-document-xml">documents in the XML syntax</a>
+ described in this specification are intended to be the same as
+ those defined in the XML specification.</p>
</div>
<div id="mime-types" class="section">
<h2>3.02. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="#mime-types-toc">T</a>
@@ -951,24 +951,19 @@
<p>A conformant
<dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn>
must be a
- <dfn id="well-formed-xml-document">well-formed XML document</dfn>,
- as defined in the XML specification <a href="#refsXML">[XML]</a>,
+ <dfn id="namespace-well-formed-xml-document">namespace-well-formed</dfn>
+ XML document, as defined in the Namespaces in XML 1.0 specification
+ <a href="#refsXML">[XMLNS]</a>,
and its
- <dfn id="root-element">root element</dfn>,
- as defined in the XML specification <a href="#refsXML">[XML]</a>,
+ <dfn id="root-element">root element</dfn>
must be an
<a href="#html" class="element">html</a> element.</p>
- <p>Documents in the XML syntax must conform to XML constraints
- as defined in the XML specification
- <a href="#refsXML">[XML]</a>
- and in the Namespaces in XML 1.0 specification
- <a href="#refsXML">[XMLNS]</a>
- — including XML well-formedness constraints — and must not
- make use of any features of the
+ <p class="note">
+ Documents in the XML syntax must not make use of any features
+ of the
<a href="#html-syntax">HTML syntax</a>
- that do not follow XML
- well-formedness constraints (for example, documents in the XML
- syntax must not use
+ that do not follow XML well-formedness constraints (for
+ example, documents in the XML syntax must not use
<a href="#syntax-attr-unquoted">unquoted attribute value syntax</a>
and must not
<a href="#omitted">omit tags</a>).</p>
Received on Friday, 5 March 2010 08:54:17 UTC