html5/html4-differences Overview.html,1.60,1.61 Overview.src.html,1.39,1.40

Update of /sources/public/html5/html4-differences
In directory hutz:/tmp/cvs-serv12091

Modified Files:
	Overview.html Overview.src.html 
Log Message:
XHTML 1, not XHTML1; media, not MIME

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/html4-differences/Overview.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Overview.html	11 Feb 2009 11:48:19 -0000	1.60
+++ Overview.html	11 Feb 2009 13:11:20 -0000	1.61
@@ -367,14 +367,14 @@
 &lt;/html></code></pre>
 
   <p>The other syntax that can be used for HTML&nbsp;5 is XML. This syntax is
-   compatible with XHTML1 documents and implementations. Documents using this
-   syntax need to be served with an XML MIME type and elements need to be put
-   in the <code>http://www.w3.org/1999/xhtml</code> namespace following the
-   rules set forth by the XML specifications. [<cite><a
+   compatible with XHTML&nbsp;1 documents and implementations. Documents
+   using this syntax need to be served with an XML media type and elements
+   need to be put in the <code>http://www.w3.org/1999/xhtml</code> namespace
+   following the rules set forth by the XML specifications. [<cite><a
    href="#ref-xml">XML</a></cite>]
 
   <p>Below is an example document that conforms to the XML syntax of
-   HTML&nbsp;5. Note that XML documents must have an XML MIME type such as
+   HTML&nbsp;5. Note that XML documents must have an XML media type such as
    <code>application/xhtml+xml</code> or <code>application/xml</code>.
 
   <pre><code>&lt;?xml version="1.0" encoding="UTF-8"?>
@@ -416,7 +416,7 @@
   <p>The HTML syntax of HTML&nbsp;5 requires a <code title="">DOCTYPE</code>
    to be specified to ensure that the browser renders the page in standards
    mode. The <code title="">DOCTYPE</code> has no other purpose and is
-   therefore optional for XML. Documents with an XML MIME type are always
+   therefore optional for XML. Documents with an XML media type are always
    handled in standards mode. [<cite><a
    href="#ref-doctype">DOCTYPE</a></cite>]
 
@@ -1016,7 +1016,7 @@
    <li>An API that enables offline Web applications.
 
    <li>An API that allows a Web application to register itself for certain
-    protocols or MIME types.
+    protocols or media types.
 
    <li>Editing API in combination with a new global
     <code>contenteditable</code> attribute.

Index: Overview.src.html
===================================================================
RCS file: /sources/public/html5/html4-differences/Overview.src.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Overview.src.html	11 Feb 2009 11:48:19 -0000	1.39
+++ Overview.src.html	11 Feb 2009 13:11:20 -0000	1.40
@@ -289,14 +289,14 @@
 &lt;/html></code></pre>
 
     <p>The other syntax that can be used for HTML&nbsp;5 is XML. This syntax
-    is compatible with XHTML1 documents and implementations. Documents using
-    this syntax need to be served with an XML MIME type and elements need to be put
-    in the <code>http://www.w3.org/1999/xhtml</code> namespace following the
-    rules set forth by the XML specifications.
+    is compatible with XHTML&nbsp;1 documents and implementations. Documents
+    using this syntax need to be served with an XML media type and elements
+    need to be put in the <code>http://www.w3.org/1999/xhtml</code>
+    namespace following the rules set forth by the XML specifications.
     [<cite><span>XML</span></cite>]</p>
 
     <p>Below is an example document that conforms to the XML syntax of
-    HTML&nbsp;5. Note that XML documents must have an XML MIME type such as
+    HTML&nbsp;5. Note that XML documents must have an XML media type such as
     <code>application/xhtml+xml</code> or <code>application/xml</code>.</p>
     
     <pre><code>&lt;?xml version="1.0" encoding="UTF-8"?>
@@ -340,7 +340,7 @@
     <code title="">DOCTYPE</code> to be specified to ensure that the browser
     renders the page in standards mode. The <code title="">DOCTYPE</code>
     has no other purpose and is therefore optional for XML. Documents with
-    an XML MIME type are always handled in standards mode.
+    an XML media type are always handled in standards mode.
     [<cite><span>DOCTYPE</span></cite>]</p>
 
     <p>The <code title="">DOCTYPE</code> declaration is
@@ -351,8 +351,8 @@
     case and the <code title="">DOCTYPE</code> is only needed to enable
     standards mode for documents written using the HTML syntax. Browsers
     already do this for <code>&lt;!DOCTYPE html></code>.</p>
-    
-    
+
+
     <h3 id="syntax-misc">Miscellaneous</h3>
     
     <p>There are a few other syntax changes worthy of mentioning:</p>
@@ -916,8 +916,8 @@
 
       <li>An API that enables offline Web applications.</li>
 
-      <li>An API that allows a Web application to register itself for certain
-      protocols or MIME types.</li>
+      <li>An API that allows a Web application to register itself for
+      certain protocols or media types.</li>
 
       <li>Editing API in combination with a new global
       <code>contenteditable</code> attribute.</li>

Received on Wednesday, 11 February 2009 13:11:39 UTC