[e] (0) Update terminology to match DOM Core.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13138 Affected topics: DOM APIs, HTML git-svn-id: http://svn.whatwg.org/webapps@6897 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 13, 2012 · 9aff8ab · 9aff8ab
1 parent 82e34d9
commit 9aff8ab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/complete.html b/complete.html
@@ -3853,7 +3853,7 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
      <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>
@@ -63970,7 +63970,7 @@ <h4 id=read-html><span class=secno>6.5.2 </span><dfn title=navigate-html>Page lo
   <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
@@ -64068,7 +64068,7 @@ <h4 id=read-text><span class=secno>6.5.4 </span><dfn title=navigate-text>Page lo
   <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<!-- to get eaten, so that a leading
@@ -64153,7 +64153,7 @@ <h4 id=read-media><span class=secno>6.5.6 </span><dfn title=navigate-media>Page
 
   <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>
@@ -64207,7 +64207,7 @@ <h4 id=read-plugin><span class=secno>6.5.7 </span><dfn title=navigate-plugin>Pag
   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>
@@ -64248,7 +64248,7 @@ <h4 id=read-ua-inline><span class=secno>6.5.8 </span><dfn title=navigate-ua-inli
 
   <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

diff --git a/index b/index
@@ -3853,7 +3853,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      <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>
@@ -63970,7 +63970,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   <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
@@ -64068,7 +64068,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   <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<!-- to get eaten, so that a leading
@@ -64153,7 +64153,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
 
   <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>
@@ -64207,7 +64207,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
   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>
@@ -64248,7 +64248,7 @@ State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BU
 
   <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

diff --git a/source b/source
@@ -2801,7 +2801,7 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
      <li>The <dfn title="concept-event-type">type</dfn> of an event</li>
      <li>The concept of an <dfn title=concept-event-listener>event listener</dfn> and the <span title=concept-event-listener>event listeners</span> associated with an <code>EventTarget</code></li>
 
-     <li>The <dfn title="document's character encoding">character encoding</dfn> and <dfn title="concept-document-media-type">media type</dfn> of a <code>Document</code></li>
+     <li>The <dfn title="document's character encoding">encoding</dfn> (herein the <i>character encoding</i>) and <dfn title="concept-document-content-type">content type</dfn> of a <code>Document</code></li>
      <li>The distinction between <dfn>XML documents</dfn> and <dfn>HTML documents</dfn></li>
      <li>The terms <dfn>quirks mode</dfn>, <dfn>limited-quirks mode</dfn>, and <dfn>no-quirks mode</dfn></li>
      <li>The algorithm to <dfn title="concept-node-clone">clone</dfn> a <code>Node</code>, and the concept of <dfn title="concept-node-clone-ext">cloning steps</dfn> used by tat algorithm</li>
@@ -74825,7 +74825,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   context</span>, the user agent must <span>queue a task</span> to
   <span>create a <code>Document</code> object</span>, mark it as being
   an <span title="HTML documents">HTML document</span>, set its <span
-  title="concept-document-media-type">media type</span> to "<code
+  title="concept-document-content-type">content type</span> to "<code
   title="">text/html</code>", create an <span>HTML parser</span>, and
   associate it with the document. Each <span
   title="concept-task">task</span> that the <span>networking task
@@ -74938,7 +74938,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   context</span>, the user agent must <span>queue a task</span> to
   <span>create a <code>Document</code> object</span>, mark it as being
   an <span title="HTML documents">HTML document</span>, set its <span
-  title="concept-document-media-type">media type</span> to "<code
+  title="concept-document-content-type">content type</span> to "<code
   title="">text/plain</code>", create an <span>HTML parser</span>,
   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
@@ -75028,7 +75028,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   <span>browsing context</span>, the user agent should <span>create a
   <code>Document</code> object</span>, mark it as being an <span
   title="HTML documents">HTML document</span>, set its <span
-  title="concept-document-media-type">media type</span> to the sniffed
+  title="concept-document-content-type">content type</span> to the sniffed
   MIME type of the resource (<var title="">type</var> in the
   <span>navigate</span> algorithm), append an <code>html</code>
   element to the <code>Document</code>, append a <code>head</code>
@@ -75090,7 +75090,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   is to be loaded in a <span>browsing context</span>, the user agent
   should <span>create a <code>Document</code> object</span>, mark it
   as being an <span title="HTML documents">HTML document</span>, set
-  its <span title="concept-document-media-type">media type</span> to
+  its <span title="concept-document-content-type">content type</span> to
   the sniffed MIME type of the resource (<var title="">type</var> in
   the <span>navigate</span> algorithm), append an <code>html</code>
   element to the <code>Document</code>, append a <code>head</code>
@@ -75135,7 +75135,7 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
   <span>browsing context</span>, the user agent should <span>create a
   <code>Document</code> object</span>, mark it as being an <span
   title="HTML documents">HTML document</span>, set its <span
-  title="concept-document-media-type">media type</span> to "<code
+  title="concept-document-content-type">content type</span> to "<code
   title="">text/html</code>", and then either associate that
   <code>Document</code> with a custom rendering that is not rendered
   using the normal <code>Document</code> rendering rules, or mutate