hixie: Tighten up the definition and use of the terms 'preferred name' and 'preferred MIME name'. (whatwg r3943)

hixie: Tighten up the definition and use of the terms 'preferred name'
and 'preferred MIME name'. (whatwg r3943)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3104&r2=1.3105&f=h
http://html5.org/tools/web-apps-tracker?from=3942&to=3943

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3104
retrieving revision 1.3105
diff -u -d -r1.3104 -r1.3105
--- Overview.html 21 Sep 2009 23:29:54 -0000 1.3104
+++ Overview.html 21 Sep 2009 23:36:57 -0000 1.3105
@@ -1702,7 +1702,10 @@
   interacting with external content intended for <a href="#plugin" title="plugin">plugins</a>. When third-party software is run with
   the same privileges as the user agent itself, vulnerabilities in the
   third-party software become as dangerous as those in the user
-  agent.<h4 id="character-encodings"><span class="secno">2.1.6 </span>Character encodings</h4><p class="XXX annotation"><b>Status: </b><i>Working draft</i><p>An <dfn id="ascii-compatible-character-encoding">ASCII-compatible character encoding</dfn> is a
+  agent.<h4 id="character-encodings"><span class="secno">2.1.6 </span>Character encodings</h4><p class="XXX annotation"><b>Status: </b><i>Working draft</i><p>The <dfn id="preferred-mime-name">preferred MIME name</dfn> of a character encoding is the
+  name or alias labeled as "preferred MIME name" in the IANA
+  <cite>Character Sets</cite> registry, if there is one, or the
+  encoding's name, if none of the aliases are so labeled.  <a href="#refsIANACHARSET">[IANACHARSET]</a><p>An <dfn id="ascii-compatible-character-encoding">ASCII-compatible character encoding</dfn> is a
   single-byte or variable-length encoding in which the bytes 0x09,
   0x0A, 0x0C, 0x0D, 0x20 - 0x22, 0x26, 0x27, 0x2C - 0x3F, 0x41 - 0x5A,
   and 0x61 - 0x7A<!-- is that list ok? do any character sets we want
@@ -6282,22 +6285,22 @@
   loading affect this value, as does the <code title="dom-document-charset"><a href="#dom-document-charset">charset</a></code> setter. <a href="#refsIANACHARSET">[IANACHARSET]</a></p>
 
   <p>The <dfn id="dom-document-charset" title="dom-document-charset"><code>charset</code></dfn>
-  IDL attribute must, on getting, return the preferred MIME name of
-  the <a href="#document-s-character-encoding">document's character encoding</a>. On setting, if the
-  new value is an IANA-registered alias for a character encoding
-  supported by the user agent, the <a href="#document-s-character-encoding">document's character
-  encoding</a> must be set to that character encoding. (Otherwise,
-  nothing happens.)</p>
+  IDL attribute must, on getting, return the <a href="#preferred-mime-name">preferred MIME
+  name</a> of the <a href="#document-s-character-encoding">document's character encoding</a>. On
+  setting, if the new value is an IANA-registered alias for a
+  character encoding supported by the user agent, the <a href="#document-s-character-encoding">document's
+  character encoding</a> must be set to that character
+  encoding. (Otherwise, nothing happens.)</p>
 
   <p>The <dfn id="dom-document-characterset" title="dom-document-characterSet"><code>characterSet</code></dfn>
-  IDL attribute must, on getting, return the preferred MIME name of
-  the <a href="#document-s-character-encoding">document's character encoding</a>.</p>
+  IDL attribute must, on getting, return the <a href="#preferred-mime-name">preferred MIME
+  name</a> of the <a href="#document-s-character-encoding">document's character encoding</a>.</p>
 
   <p>The <dfn id="dom-document-defaultcharset" title="dom-document-defaultCharset"><code>defaultCharset</code></dfn>
-  IDL attribute must, on getting, return the preferred MIME name of a
-  character encoding, possibly the user's default encoding, or an
-  encoding associated with the user's current geographical location,
-  or any arbitrary encoding name.</p>
+  IDL attribute must, on getting, return the <a href="#preferred-mime-name">preferred MIME
+  name</a> of a character encoding, possibly the user's default
+  encoding, or an encoding associated with the user's current
+  geographical location, or any arbitrary encoding name.</p>
 
   <hr></div><dl class="domintro"><dt><var title="">document</var> . <code title="dom-document-readyState"><a href="#dom-document-readystate">readyState</a></code></dt>
    <dd>
@@ -10176,7 +10179,7 @@
    character encoding used to serialize the file.</li>
 
    <li>The value must be a valid character encoding name, and must be
-   the preferred name for that encoding. <a href="#refsIANACHARSET">[IANACHARSET]</a></li>
+   the <a href="#preferred-mime-name">preferred MIME name</a> for that encoding. <a href="#refsIANACHARSET">[IANACHARSET]</a></li>
 
    <li>The character encoding declaration must be serialized without
    the use of <a href="#syntax-charref" title="syntax-charref">character references</a>
@@ -10547,10 +10550,10 @@
   attribute gives the character encoding of the external script
   resource. The attribute must not be specified if the <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute is not present. If the
   attribute is set, its value must be a valid character encoding name,
-  must be the preferred name for that encoding, and must match the
-  encoding given in the <code title="">charset</code> parameter of the
-  <a href="#content-type" title="Content-Type">Content-Type metadata</a> of the
-  external file, if any. <a href="#refsIANACHARSET">[IANACHARSET]</a><p>The <dfn id="attr-script-async" title="attr-script-async"><code>async</code></dfn> and
+  must be the <a href="#preferred-mime-name">preferred MIME name</a> for that encoding, and
+  must match the encoding given in the <code title="">charset</code>
+  parameter of the <a href="#content-type" title="Content-Type">Content-Type
+  metadata</a> of the external file, if any. <a href="#refsIANACHARSET">[IANACHARSET]</a><p>The <dfn id="attr-script-async" title="attr-script-async"><code>async</code></dfn> and
   <dfn id="attr-script-defer" title="attr-script-defer"><code>defer</code></dfn> attributes
   are <a href="#boolean-attribute" title="boolean attribute">boolean attributes</a> that
   indicate how the script should be executed.<p>There are three possible modes that can be selected using these
@@ -26973,8 +26976,8 @@
   attribute gives the character encodings that are to be used for the
   submission. If specified, the value must be an <a href="#ordered-set-of-unique-space-separated-tokens">ordered set of
   unique space-separated tokens</a>, and each token must be the
-  preferred name of an <a href="#ascii-compatible-character-encoding">ASCII-compatible character
-  encoding</a>. <a href="#refsIANACHARSET">[IANACHARSET]</a><p>The <dfn id="attr-form-name" title="attr-form-name"><code>name</code></dfn> attribute
+  <a href="#preferred-mime-name">preferred MIME name</a> of an <a href="#ascii-compatible-character-encoding">ASCII-compatible
+  character encoding</a>. <a href="#refsIANACHARSET">[IANACHARSET]</a><p>The <dfn id="attr-form-name" title="attr-form-name"><code>name</code></dfn> attribute
   represents the <code><a href="#the-form-element">form</a></code>'s name within the <code title="dom-document-forms"><a href="#dom-document-forms">forms</a></code> collection. The value must
   not be the empty string, and the value must be unique amongst the
   <code><a href="#the-form-element">form</a></code> elements in the <code title="dom-document-forms"><a href="#dom-document-forms">forms</a></code> collection that it is in, if
@@ -34632,8 +34635,8 @@
 
    </li>
 
-   <li><p>Let <var title="">charset</var> be the preferred MIME name
-   of the selected character encoding.</li>
+   <li><p>Let <var title="">charset</var> be the <a href="#preferred-mime-name">preferred MIME
+   name</a> of the selected character encoding.</li>
 
    <li><p>If the entry's name is "<code title="">_charset_</code>" and
    its type is "<code title="">hidden</code>", replace its value with
@@ -34745,8 +34748,8 @@
 
    </li>
 
-   <li><p>Let <var title="">charset</var> be the preferred MIME name
-   of the selected character encoding.</li>
+   <li><p>Let <var title="">charset</var> be the <a href="#preferred-mime-name">preferred MIME
+   name</a> of the selected character encoding.</li>
 
    <li><p>If the entry's name is "<code title="">_charset_</code>" and
    its type is "<code title="">hidden</code>", replace its value with
@@ -55999,10 +56002,10 @@
   <p class="note">It is not unusual for Web browsers to support dozens
   if not upwards of a hundred distinct character encodings.</p>
 
-  <p>User agents must support the preferred MIME name of every
-  character encoding they support that has a preferred MIME name, and
-  should support all the IANA-registered aliases of every character
-  encoding they support. <a href="#refsIANACHARSET">[IANACHARSET]</a></p>
+  <p>User agents must support the <a href="#preferred-mime-name">preferred MIME name</a> of
+  every character encoding they support, and should support all the
+  IANA-registered names and aliases of every character encoding they
+  support. <a href="#refsIANACHARSET">[IANACHARSET]</a></p>
 
   <p>When comparing a string specifying a character encoding with the
   name or alias of a character encoding to determine if they are
@@ -68477,8 +68480,8 @@
       declaration">character encoding declarations</a> in the
       document. The parameter's value must be the name of the
       character encoding used to serialize the file, must be a valid
-      character encoding name, and must be the preferred name for that
-      encoding. <a href="#refsIANACHARSET">[IANACHARSET]</a></p>
+      character encoding name, and must be the <a href="#preferred-mime-name">preferred MIME
+      name</a> for that encoding. <a href="#refsIANACHARSET">[IANACHARSET]</a></p>
      </dd>
     </dl></dd>
    <dt>Encoding considerations:</dt>

Received on Monday, 21 September 2009 23:38:03 UTC