html5/markup/src html-xhtml.html,1.1,1.2

Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv28170/src

Modified Files:
	html-xhtml.html 
Log Message:
reworded the "The HTML namespace and MIME types" section.


Index: html-xhtml.html
===================================================================
RCS file: /sources/public/html5/markup/src/html-xhtml.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- html-xhtml.html	29 Jun 2009 09:18:49 -0000	1.1
+++ html-xhtml.html	14 Jul 2009 15:41:52 -0000	1.2
@@ -6,46 +6,56 @@
   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>
   <section id="mime-types">
-    <h2>The HTML and XML syntaxes and MIME types</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 <!--by Web browsers and other user agents-->
-    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 <!--by Web browsers and other user agents-->
-    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>
+    <h2>The HTML namespace and MIME types</h2>
+    <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>
   </section>
   <section id="documents">
     <h2>Conformant documents</h2>
@@ -95,6 +105,6 @@
       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>
   </section>
 </section>

Received on Tuesday, 14 July 2009 16:13:02 UTC