hixie: Update terminology to match DOM Core. (whatwg r6897)

hixie: Update terminology to match DOM Core. (whatwg r6897)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5494&r2=1.5495&f=h
http://html5.org/tools/web-apps-tracker?from=6896&to=6897

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5494
retrieving revision 1.5495
diff -u -d -r1.5494 -r1.5495
--- Overview.html 13 Jan 2012 22:12:40 -0000 1.5494
+++ Overview.html 13 Jan 2012 23:12:10 -0000 1.5495
@@ -3196,7 +3196,7 @@
      <li>The <dfn id="concept-event-type" title="concept-event-type">type</dfn> of an event</li>
      <li>The concept of an <dfn id="concept-event-listener" title="concept-event-listener">event listener</dfn> and the <a href="#concept-event-listener" title="concept-event-listener">event listeners</a> associated with an <code><a href="#eventtarget">EventTarget</a></code></li>
 
-     <li>The <dfn id="document-s-character-encoding" title="document's character encoding">character encoding</dfn> and <dfn id="concept-document-media-type" title="concept-document-media-type">media type</dfn> of a <code><a href="#document">Document</a></code></li>
+     <li>The <dfn id="document-s-character-encoding" title="document's character encoding">encoding</dfn> (herein the <i>character encoding</i>) and <dfn id="concept-document-content-type" title="concept-document-content-type">content type</dfn> of a <code><a href="#document">Document</a></code></li>
      <li>The distinction between <dfn id="xml-documents">XML documents</dfn> and <dfn id="html-documents">HTML documents</dfn></li>
      <li>The terms <dfn id="quirks-mode">quirks mode</dfn>, <dfn id="limited-quirks-mode">limited-quirks mode</dfn>, and <dfn id="no-quirks-mode">no-quirks mode</dfn></li>
      <li>The algorithm to <dfn id="concept-node-clone" title="concept-node-clone">clone</dfn> a <code><a href="#node">Node</a></code>, and the concept of <dfn id="concept-node-clone-ext" title="concept-node-clone-ext">cloning steps</dfn> used by tat algorithm</li>
@@ -48329,7 +48329,7 @@
   <p>When an HTML document is to be loaded in a <a href="#browsing-context">browsing
   context</a>, the user agent must <a href="#queue-a-task">queue a task</a> to
   <a href="#create-a-document-object">create a <code>Document</code> object</a>, mark it as being
-  an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-media-type" title="concept-document-media-type">media type</a> to "<code title="">text/html</code>", create an <a href="#html-parser">HTML parser</a>, and
+  an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-content-type" title="concept-document-content-type">content type</a> to "<code title="">text/html</code>", create an <a href="#html-parser">HTML parser</a>, and
   associate it with the document. Each <a href="#concept-task" title="concept-task">task</a> that the <a href="#networking-task-source">networking task
   source</a> places on the <a href="#task-queue">task queue</a> while the <a href="#fetch" title="fetch">fetching algorithm</a> runs must then fill the
   parser's <a href="#the-input-stream">input stream</a> with the fetched bytes and cause
@@ -48426,7 +48426,7 @@
   <p>When a plain text document is to be loaded in a <a href="#browsing-context">browsing
   context</a>, the user agent must <a href="#queue-a-task">queue a task</a> to
   <a href="#create-a-document-object">create a <code>Document</code> object</a>, mark it as being
-  an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-media-type" title="concept-document-media-type">media type</a> to "<code title="">text/plain</code>", create an <a href="#html-parser">HTML parser</a>,
+  an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-content-type" title="concept-document-content-type">content type</a> to "<code title="">text/plain</code>", create an <a href="#html-parser">HTML parser</a>,
   associate it with the document, act as if the tokenizer had emitted
   a start tag token with the tag name "pre" followed by a single
   U+000A LINE FEED (LF) character, and switch
@@ -48507,7 +48507,7 @@
 
   <p>When an image, video, or audio resource is to be loaded in a
   <a href="#browsing-context">browsing context</a>, the user agent should <a href="#create-a-document-object">create a
-  <code>Document</code> object</a>, mark it as being an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-media-type" title="concept-document-media-type">media type</a> to the sniffed
+  <code>Document</code> object</a>, mark it as being an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-content-type" title="concept-document-content-type">content type</a> to the sniffed
   MIME type of the resource (<var title="">type</var> in the
   <a href="#navigate">navigate</a> algorithm), append an <code><a href="#the-html-element">html</a></code>
   element to the <code><a href="#document">Document</a></code>, append a <code><a href="#the-head-element">head</a></code>
@@ -48560,7 +48560,7 @@
   is to be loaded in a <a href="#browsing-context">browsing context</a>, the user agent
   should <a href="#create-a-document-object">create a <code>Document</code> object</a>, mark it
   as being an <a href="#html-documents" title="HTML documents">HTML document</a>, set
-  its <a href="#concept-document-media-type" title="concept-document-media-type">media type</a> to
+  its <a href="#concept-document-content-type" title="concept-document-content-type">content type</a> to
   the sniffed MIME type of the resource (<var title="">type</var> in
   the <a href="#navigate">navigate</a> algorithm), append an <code><a href="#the-html-element">html</a></code>
   element to the <code><a href="#document">Document</a></code>, append a <code><a href="#the-head-element">head</a></code>
@@ -48600,7 +48600,7 @@
 
   <p>When the user agent is to display a user agent page inline in a
   <a href="#browsing-context">browsing context</a>, the user agent should <a href="#create-a-document-object">create a
-  <code>Document</code> object</a>, mark it as being an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-media-type" title="concept-document-media-type">media type</a> to "<code title="">text/html</code>", and then either associate that
+  <code>Document</code> object</a>, mark it as being an <a href="#html-documents" title="HTML documents">HTML document</a>, set its <a href="#concept-document-content-type" title="concept-document-content-type">content type</a> to "<code title="">text/html</code>", and then either associate that
   <code><a href="#document">Document</a></code> with a custom rendering that is not rendered
   using the normal <code><a href="#document">Document</a></code> rendering rules, or mutate
   that <code><a href="#document">Document</a></code> until it represents the content the user

Received on Friday, 13 January 2012 23:16:16 UTC