W3C home > Mailing lists > Public > public-html-diffs@w3.org > July 2009

mike: reworded the "The HTML namespace and MIME types" section.

From: poot <cvsmail@w3.org>
Date: Wed, 15 Jul 2009 00:42:24 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090714154224.46EF32BC38@toro.w3.mag.keio.ac.jp>
mike: reworded the "The HTML namespace and MIME types" section.

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.323&r2=1.324&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- Overview.html	9 Jul 2009 20:31:07 -0000	1.323
+++ Overview.html	14 Jul 2009 15:41:51 -0000	1.324
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>10 July 2009</em>
+<h2>Editor&#8217;s Draft <em>15 July 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 10 July 2009 Editor&#8217;s Draft of 
+        This document is the 15 July 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -159,7 +159,7 @@
 <a href="html-and-xhtml.html#html-and-xhtml">5. HTML and XHTML documents</a>
 <ul>
 <li id="mime-types-toc">
-<a href="html-and-xhtml.html#mime-types">5.1. The HTML and XML syntaxes and MIME types</a>
+<a href="html-and-xhtml.html#mime-types">5.1. The HTML namespace and MIME types</a>
 </li>
 <li id="documents-toc">
 <a href="html-and-xhtml.html#documents">5.2. Conformant documents</a>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- Makefile	1 Jul 2009 14:12:02 -0000	1.70
+++ Makefile	14 Jul 2009 15:41:51 -0000	1.71
@@ -119,7 +119,7 @@
 html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \
   tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \
   schema.html html.rnc.xml src/head.html src/header.src.html src/intro-scope.html \
-  src/conformance.html src/structure.html src/terms.html src/syntax.html \
+  src/conformance.html src/structure.html src/terms.html src/syntax.html src/html-xhtml.html \
   $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \
   schema/LICENSE.xml html.css.xml html.css.LICENSE.xml
 	$(XSLTPROC) $(XSLTPROCFLAGS) tools/generate-spec-source.xsl $< > $@

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- spec.html	10 Jul 2009 02:29:18 -0000	1.47
+++ spec.html	14 Jul 2009 15:41:52 -0000	1.48
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>10 July 2009</em>
+<h2>Editor&#8217;s Draft <em>15 July 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 10 July 2009 Editor&#8217;s Draft of 
+        This document is the 15 July 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -158,7 +158,7 @@
 <a href="#html-and-xhtml">5. HTML and XHTML documents</a>
 <ul>
 <li id="mime-types-toc">
-<a href="#mime-types">5.1. The HTML and XML syntaxes and MIME types</a>
+<a href="#mime-types">5.1. The HTML namespace and MIME types</a>
 </li>
 <li id="documents-toc">
 <a href="#documents">5.2. Conformant documents</a>
@@ -814,7 +814,7 @@
   <div class="toc">
 <ul>
 <li id="mime-types-toc">
-<a href="#mime-types">1. The HTML and XML syntaxes and MIME types</a>
+<a href="#mime-types">1. The HTML namespace and MIME types</a>
 </li>
 <li id="documents-toc">
 <a href="#documents">2. Conformant documents</a>
@@ -825,45 +825,51 @@
   can potentially represent in memory in any number of possible
   ways, and that can be transmitted using any number of possible
   concrete syntaxes. This specification makes reference to 
-  two particular concrete syntaxes: One syntax which,
-  for the sake of simplicity is referred to throughout this
-  specification as
+  two particular concrete syntaxes: One syntax which
+  is referred to throughout this specification as
   <a href="#html-syntax">the HTML syntax</a>,
-  and an alternative syntax, which for the sake of simplicity is
-  referred to throughout this specification as
+  and another syntax, which is referred to throughout this
+  specification as
   <a href="#xml-syntax">the XML syntax</a>.</p>
   <p>Web browsers typically implement two separate parsers for
-  processing HTML content: an
+  processing documents: an
   <dfn id="html-parser">HTML parser</dfn>
-  which is invoked when processing documents transmitted in the
+  which is invoked when processing documents in the
   <a href="#html-syntax">HTML syntax</a>, and an
   <dfn id="xml-parser">XML parser</dfn>
-  which is invoked when processing documents transmitted in the
+  which is invoked when processing documents in the
   <a href="#xml-syntax">XML syntax</a>.</p>
+  <p>The <dfn id="html-syntax" title="html-syntax">HTML syntax</dfn>
+  is the syntax described in the
+  <a href="#syntax">HTML syntax</a>
+  section of this specification. The
+  <dfn id="xml-syntax" title="xml-syntax">XML syntax</dfn>
+  is defined by rules in the XML specification
+  <a href="#refsXML">[XML]</a>.</p>
   <div id="mime-types" class="section">
-    <h2>5.1. The HTML and XML syntaxes and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="#mime-types-toc">T</a>
+    <h2>5.1. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="#mime-types-toc">T</a>
 </h2>
-    <p>For the purposes of this specification, the term
-    <dfn id="html-syntax" title="syntax-html-syntax">HTML syntax</dfn> refers to the
-    syntax which is processed 
-    using <span title="syntax-html-parser">HTML parsers</span>.
-    <a href="#syntax-document-html">Documents in the HTML
-      syntax</a> use the <code>text/html</code> MIME type. In
-    particular, <a href="#syntax-document-html">documents in the
-      HTML syntax</a> that are served over the wire (for example,
-    by HTTP) must be labeled with the <code>text/html</code> MIME
-    type.</p>
-    <p>For the purposes of this specification, the term
-    <dfn id="xml-syntax" title="syntax-xml-syntax">XML syntax</dfn> refers to the
-    syntax which is processed 
-    using <span title="syntax-html-parser">XML parsers</span>.
-    <a href="#syntax-document-xml">Documents in the XML
-    syntax</a> that use the new features described in this
-    specification and that are served over the wire (for example, by
-    HTTP) must be labeled with an XML MIME type such as
-    <code>application/xml</code> or
-    <code>application/xhtml+xml</code> and must not be labeled with
-    the <code>text/html</code> MIME type.</p>
+    <p>The
+    <dfn id="html-namespace" title="html-namespace">HTML namespace</dfn>
+    is defined as <code>http://www.w3.org/1999/xhtml</code>.
+    The <a href="#html-namespace">HTML namespace</a> is the
+    namespace both for 
+    <a href="#syntax-document-html">documents in the HTML syntax</a>
+    and for
+    <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
+    <p>Documents that are served with the
+    <code>text/html</code> MIME type must conform to the rules in this
+    specification for
+    <a href="#syntax-document-html">documents in the HTML syntax</a>.</p>
+    <p>Documents that have an
+    <a href="#html-namespace">HTML namespace</a>
+    declaration and that are served with an XML MIME type
+    such as
+    <code>text/xml</code>,
+    <code>application/xml</code>, or
+    <code>application/xhtml+xml</code>
+    must conform to the rules in this specification for
+    <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
   </div>
   <div id="documents" class="section">
     <h2>5.2. Conformant documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="#documents-toc">T</a>
@@ -910,7 +916,7 @@
     constraints &#8212; and 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 <a href="#syntax-attr-unquoted">unquoted attribute
-      value syntax</a> or <a href="#omitted">omit tags</a>).</p>
+      value syntax</a> and must not <a href="#omitted">omit tags</a>).</p>
   </div>
 </div>
     <div id="syntax" class="section">
Received on Tuesday, 14 July 2009 15:58:43 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:07 GMT