[html5] r7419 - [e] (0) s/encoding/character encoding/ Fixing https://www.w3.org/Bugs/Public/sho [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Sep 27 16:42:50 PDT 2012


Author: ianh
Date: 2012-09-27 16:42:49 -0700 (Thu, 27 Sep 2012)
New Revision: 7419

Modified:
   complete.html
   index
   source
Log:
[e] (0) s/encoding/character encoding/
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17862
Affected topics: HTML, HTML Syntax and Parsing

Modified: complete.html
===================================================================
--- complete.html	2012-09-27 23:29:20 UTC (rev 7418)
+++ complete.html	2012-09-27 23:42:49 UTC (rev 7419)
@@ -372,7 +372,7 @@
      <li><a href=#processing-model><span class=secno>2.7.2 </span>Processing model</a></li>
      <li><a href=#encrypted-http-and-related-security-concerns><span class=secno>2.7.3 </span>Encrypted HTTP and related security concerns</a></li>
      <li><a href=#content-type-sniffing><span class=secno>2.7.4 </span>Determining the type of a resource</a></li>
-     <li><a href=#extracting-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting encodings from <code>meta</code> elements</a></li>
+     <li><a href=#extracting-character-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting character encodings from <code>meta</code> elements</a></li>
      <li><a href=#cors-settings-attributes><span class=secno>2.7.6 </span>CORS settings attributes</a></li>
      <li><a href=#cors-enabled-fetch><span class=secno>2.7.7 </span>CORS-enabled fetch</a></ol></li>
    <li><a href=#common-dom-interfaces><span class=secno>2.8 </span>Common DOM interfaces</a>
@@ -8688,10 +8688,10 @@
   Media Type Sniffing specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
 
 
-  <h4 id=extracting-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting encodings from <code><a href=#the-meta-element>meta</a></code> elements</h4>
+  <h4 id=extracting-character-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting character encodings from <code><a href=#the-meta-element>meta</a></code> elements</h4>
 
-  <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
-  <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+  <p>The <dfn id=algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding from a
+  <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns a character encoding or
   nothing.</p>
 
   <ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
@@ -16068,7 +16068,7 @@
 
   <p class=note>A character encoding declaration is required (either
   in the <a href=#content-type title=Content-Type>Content-Type metadata</a> or
-  explicitly in the file) even if the encoding is US-ASCII, because an
+  explicitly in the file) even if the encoding is US-ASCII, because a character
   encoding is needed to process non-ASCII characters entered by the
   user in forms, in URLs generated by scripts, and so forth.</p>
 
@@ -88485,7 +88485,7 @@
   <p>The <a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> defined below is
   used to determine the character encoding.</p>
 
-  <p>Given an encoding, the bytes in the <a href=#the-input-byte-stream>input byte
+  <p>Given a character encoding, the bytes in the <a href=#the-input-byte-stream>input byte
   stream</a> must be converted to Unicode code points for the
   tokenizer's <a href=#input-stream>input stream</a>, as described by the rules for
   that encoding, except that the leading U+FEFF BYTE ORDER MARK
@@ -88521,7 +88521,7 @@
   before beginning to parse the document. Then, the real parser is
   started, using a tentative encoding derived from this pre-parse and
   other out-of-band metadata. If, while the document is being loaded,
-  the user agent discovers an encoding declaration that conflicts with
+  the user agent discovers a character encoding declaration that conflicts with
   this information, then the parser can get reinvoked to perform a
   parse of the document with the real encoding.</p>
 
@@ -88530,14 +88530,14 @@
   determine the character encoding to use when decoding a document in
   the first pass. This algorithm takes as input any out-of-band
   metadata available to the user agent (e.g. the <a href=#content-type title=Content-Type>Content-Type metadata</a> of the document)
-  and all the bytes available so far, and returns an encoding and a
+  and all the bytes available so far, and returns a character encoding and a
   <dfn id=concept-encoding-confidence title=concept-encoding-confidence>confidence</dfn>. The
   confidence is either <i>tentative</i>, <i>certain</i>, or
   <i>irrelevant</i>. The encoding used, and whether the confidence in
   that encoding is <i>tentative</i> or <i>certain</i>, is <a href=#meta-charset-during-parse>used during the parsing</a> to
   determine whether to <a href=#change-the-encoding>change the encoding</a>. If no
   encoding is necessary, e.g. because the parser is operating on a
-  Unicode stream and doesn't have to use an encoding at all, then the
+  Unicode stream and doesn't have to use a character encoding at all, then the
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
@@ -88623,7 +88623,7 @@
 
    </li>
 
-   <li><p>If the transport layer specifies an encoding, and it is
+   <li><p>If the transport layer specifies a character encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
    <i>certain</i>, and abort these steps.</li>
 
@@ -88873,9 +88873,9 @@
 
          <dt>If the attribute's name is "<code title="">content</code>"</dt>
 
-         <dd><p>Apply the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding
+         <dd><p>Apply the <a href=#algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding
          from a <code>meta</code> element</a>, giving the
-         attribute's value as the string to parse. If an encoding is
+         attribute's value as the string to parse. If a character encoding is
          returned, and if <var title="">charset</var> is still set
          to null, let <var title="">charset</var> be the encoding
          returned, and set <var title="">need pragma</var> to
@@ -89140,7 +89140,7 @@
   then perform the comparison in an <a href=#ascii-case-insensitive>ASCII
   case-insensitive</a> manner.</p>
 
-  <hr><p>When a user agent would otherwise use an encoding given in the
+  <hr><p>When a user agent would otherwise use a character encoding given in the
   first column of the following table to either convert content to
   Unicode characters or convert Unicode characters to bytes, it must
   instead use the encoding given in the cell in the second column of
@@ -89223,7 +89223,7 @@
   <p>When the parser requires the user agent to <dfn id=change-the-encoding>change the
   encoding</dfn>, it must run the following steps. This might happen
   if the <a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> described above
-  failed to find an encoding, or if it found an encoding that was not
+  failed to find a character encoding, or if it found a character encoding that was not
   the actual encoding of the file.</p>
 
   <ol><li>If the encoding that is already being used to interpret the
@@ -92722,7 +92722,7 @@
     value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the
     string "<code title="">Content-Type</code>", and the element has a
     <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
-    applying the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+    applying the <a href=#algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding from a
     <code>meta</code> element</a> to that attribute's value returns
     a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or
     <a href=#a-utf-16-encoding>a UTF-16 encoding</a>, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
@@ -103811,11 +103811,11 @@
     <tr><th> <code title="">charset</code>
      <td> <code title=attr-meta-charset><a href=#attr-meta-charset>meta</a></code>
      <td> <a href=#character-encoding-declaration>Character encoding declaration</a>
-     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of an encoding*
+     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of a character encoding*
     <tr><th> <code title="">charset</code>
      <td> <code title=attr-script-charset><a href=#attr-script-charset>script</a></code>
      <td> Character encoding of the external script resource
-     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of an encoding*
+     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of a character encoding*
     <tr><th> <code title="">checked</code>
      <td> <code title=attr-command-checked><a href=#attr-command-checked>command</a></code>;
           <code title=attr-input-checked><a href=#attr-input-checked>input</a></code>

Modified: index
===================================================================
--- index	2012-09-27 23:29:20 UTC (rev 7418)
+++ index	2012-09-27 23:42:49 UTC (rev 7419)
@@ -372,7 +372,7 @@
      <li><a href=#processing-model><span class=secno>2.7.2 </span>Processing model</a></li>
      <li><a href=#encrypted-http-and-related-security-concerns><span class=secno>2.7.3 </span>Encrypted HTTP and related security concerns</a></li>
      <li><a href=#content-type-sniffing><span class=secno>2.7.4 </span>Determining the type of a resource</a></li>
-     <li><a href=#extracting-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting encodings from <code>meta</code> elements</a></li>
+     <li><a href=#extracting-character-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting character encodings from <code>meta</code> elements</a></li>
      <li><a href=#cors-settings-attributes><span class=secno>2.7.6 </span>CORS settings attributes</a></li>
      <li><a href=#cors-enabled-fetch><span class=secno>2.7.7 </span>CORS-enabled fetch</a></ol></li>
    <li><a href=#common-dom-interfaces><span class=secno>2.8 </span>Common DOM interfaces</a>
@@ -8688,10 +8688,10 @@
   Media Type Sniffing specification. <a href=#refsMIMESNIFF>[MIMESNIFF]</a></p>
 
 
-  <h4 id=extracting-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting encodings from <code><a href=#the-meta-element>meta</a></code> elements</h4>
+  <h4 id=extracting-character-encodings-from-meta-elements><span class=secno>2.7.5 </span>Extracting character encodings from <code><a href=#the-meta-element>meta</a></code> elements</h4>
 
-  <p>The <dfn id=algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
-  <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+  <p>The <dfn id=algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding from a
+  <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns a character encoding or
   nothing.</p>
 
   <ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
@@ -16068,7 +16068,7 @@
 
   <p class=note>A character encoding declaration is required (either
   in the <a href=#content-type title=Content-Type>Content-Type metadata</a> or
-  explicitly in the file) even if the encoding is US-ASCII, because an
+  explicitly in the file) even if the encoding is US-ASCII, because a character
   encoding is needed to process non-ASCII characters entered by the
   user in forms, in URLs generated by scripts, and so forth.</p>
 
@@ -88485,7 +88485,7 @@
   <p>The <a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> defined below is
   used to determine the character encoding.</p>
 
-  <p>Given an encoding, the bytes in the <a href=#the-input-byte-stream>input byte
+  <p>Given a character encoding, the bytes in the <a href=#the-input-byte-stream>input byte
   stream</a> must be converted to Unicode code points for the
   tokenizer's <a href=#input-stream>input stream</a>, as described by the rules for
   that encoding, except that the leading U+FEFF BYTE ORDER MARK
@@ -88521,7 +88521,7 @@
   before beginning to parse the document. Then, the real parser is
   started, using a tentative encoding derived from this pre-parse and
   other out-of-band metadata. If, while the document is being loaded,
-  the user agent discovers an encoding declaration that conflicts with
+  the user agent discovers a character encoding declaration that conflicts with
   this information, then the parser can get reinvoked to perform a
   parse of the document with the real encoding.</p>
 
@@ -88530,14 +88530,14 @@
   determine the character encoding to use when decoding a document in
   the first pass. This algorithm takes as input any out-of-band
   metadata available to the user agent (e.g. the <a href=#content-type title=Content-Type>Content-Type metadata</a> of the document)
-  and all the bytes available so far, and returns an encoding and a
+  and all the bytes available so far, and returns a character encoding and a
   <dfn id=concept-encoding-confidence title=concept-encoding-confidence>confidence</dfn>. The
   confidence is either <i>tentative</i>, <i>certain</i>, or
   <i>irrelevant</i>. The encoding used, and whether the confidence in
   that encoding is <i>tentative</i> or <i>certain</i>, is <a href=#meta-charset-during-parse>used during the parsing</a> to
   determine whether to <a href=#change-the-encoding>change the encoding</a>. If no
   encoding is necessary, e.g. because the parser is operating on a
-  Unicode stream and doesn't have to use an encoding at all, then the
+  Unicode stream and doesn't have to use a character encoding at all, then the
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
@@ -88623,7 +88623,7 @@
 
    </li>
 
-   <li><p>If the transport layer specifies an encoding, and it is
+   <li><p>If the transport layer specifies a character encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
    <i>certain</i>, and abort these steps.</li>
 
@@ -88873,9 +88873,9 @@
 
          <dt>If the attribute's name is "<code title="">content</code>"</dt>
 
-         <dd><p>Apply the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding
+         <dd><p>Apply the <a href=#algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding
          from a <code>meta</code> element</a>, giving the
-         attribute's value as the string to parse. If an encoding is
+         attribute's value as the string to parse. If a character encoding is
          returned, and if <var title="">charset</var> is still set
          to null, let <var title="">charset</var> be the encoding
          returned, and set <var title="">need pragma</var> to
@@ -89140,7 +89140,7 @@
   then perform the comparison in an <a href=#ascii-case-insensitive>ASCII
   case-insensitive</a> manner.</p>
 
-  <hr><p>When a user agent would otherwise use an encoding given in the
+  <hr><p>When a user agent would otherwise use a character encoding given in the
   first column of the following table to either convert content to
   Unicode characters or convert Unicode characters to bytes, it must
   instead use the encoding given in the cell in the second column of
@@ -89223,7 +89223,7 @@
   <p>When the parser requires the user agent to <dfn id=change-the-encoding>change the
   encoding</dfn>, it must run the following steps. This might happen
   if the <a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> described above
-  failed to find an encoding, or if it found an encoding that was not
+  failed to find a character encoding, or if it found a character encoding that was not
   the actual encoding of the file.</p>
 
   <ol><li>If the encoding that is already being used to interpret the
@@ -92722,7 +92722,7 @@
     value is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for the
     string "<code title="">Content-Type</code>", and the element has a
     <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
-    applying the <a href=#algorithm-for-extracting-an-encoding-from-a-meta-element>algorithm for extracting an encoding from a
+    applying the <a href=#algorithm-for-extracting-a-character-encoding-from-a-meta-element>algorithm for extracting a character encoding from a
     <code>meta</code> element</a> to that attribute's value returns
     a supported <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or
     <a href=#a-utf-16-encoding>a UTF-16 encoding</a>, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
@@ -103811,11 +103811,11 @@
     <tr><th> <code title="">charset</code>
      <td> <code title=attr-meta-charset><a href=#attr-meta-charset>meta</a></code>
      <td> <a href=#character-encoding-declaration>Character encoding declaration</a>
-     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of an encoding*
+     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of a character encoding*
     <tr><th> <code title="">charset</code>
      <td> <code title=attr-script-charset><a href=#attr-script-charset>script</a></code>
      <td> Character encoding of the external script resource
-     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of an encoding*
+     <td> <a href=#preferred-mime-name>Preferred MIME name</a> of a character encoding*
     <tr><th> <code title="">checked</code>
      <td> <code title=attr-command-checked><a href=#attr-command-checked>command</a></code>;
           <code title=attr-input-checked><a href=#attr-input-checked>input</a></code>

Modified: source
===================================================================
--- source	2012-09-27 23:29:20 UTC (rev 7418)
+++ source	2012-09-27 23:42:49 UTC (rev 7419)
@@ -8634,11 +8634,11 @@
   href="#refsMIMESNIFF">[MIMESNIFF]</a></p>
 
 
-  <h4>Extracting encodings from <code>meta</code> elements</h4>
+  <h4>Extracting character encodings from <code>meta</code> elements</h4>
 
-  <p>The <dfn>algorithm for extracting an encoding from a
+  <p>The <dfn>algorithm for extracting a character encoding from a
   <code>meta</code> element</dfn>, given a string <var
-  title="">s</var>, is as follows. It either returns an encoding or
+  title="">s</var>, is as follows. It either returns a character encoding or
   nothing.</p>
 
   <ol> <!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html -->
@@ -17141,7 +17141,7 @@
 
   <p class="note">A character encoding declaration is required (either
   in the <span title="Content-Type">Content-Type metadata</span> or
-  explicitly in the file) even if the encoding is US-ASCII, because an
+  explicitly in the file) even if the encoding is US-ASCII, because a character
   encoding is needed to process non-ASCII characters entered by the
   user in forms, in URLs generated by scripts, and so forth.</p>
 
@@ -102677,7 +102677,7 @@
   <p>The <span>encoding sniffing algorithm</span> defined below is
   used to determine the character encoding.</p>
 
-  <p>Given an encoding, the bytes in the <span>input byte
+  <p>Given a character encoding, the bytes in the <span>input byte
   stream</span> must be converted to Unicode code points for the
   tokenizer's <span>input stream</span>, as described by the rules for
   that encoding, except that the leading U+FEFF BYTE ORDER MARK
@@ -102713,7 +102713,7 @@
   before beginning to parse the document. Then, the real parser is
   started, using a tentative encoding derived from this pre-parse and
   other out-of-band metadata. If, while the document is being loaded,
-  the user agent discovers an encoding declaration that conflicts with
+  the user agent discovers a character encoding declaration that conflicts with
   this information, then the parser can get reinvoked to perform a
   parse of the document with the real encoding.</p>
 
@@ -102723,7 +102723,7 @@
   the first pass. This algorithm takes as input any out-of-band
   metadata available to the user agent (e.g. the <span
   title="Content-Type">Content-Type metadata</span> of the document)
-  and all the bytes available so far, and returns an encoding and a
+  and all the bytes available so far, and returns a character encoding and a
   <dfn title="concept-encoding-confidence">confidence</dfn>. The
   confidence is either <i>tentative</i>, <i>certain</i>, or
   <i>irrelevant</i>. The encoding used, and whether the confidence in
@@ -102731,7 +102731,7 @@
   href="#meta-charset-during-parse">used during the parsing</a> to
   determine whether to <span>change the encoding</span>. If no
   encoding is necessary, e.g. because the parser is operating on a
-  Unicode stream and doesn't have to use an encoding at all, then the
+  Unicode stream and doesn't have to use a character encoding at all, then the
   <span title="concept-encoding-confidence">confidence</span> is
   <i>irrelevant</i>.</p>
 
@@ -102832,7 +102832,7 @@
 
    </li>
 
-   <li><p>If the transport layer specifies an encoding, and it is
+   <li><p>If the transport layer specifies a character encoding, and it is
    supported, return that encoding with the <span
    title="concept-encoding-confidence">confidence</span>
    <i>certain</i>, and abort these steps.</p></li>
@@ -103146,9 +103146,9 @@
          <dt>If the attribute's name is "<code
          title="">content</code>"</dt>
 
-         <dd><p>Apply the <span>algorithm for extracting an encoding
+         <dd><p>Apply the <span>algorithm for extracting a character encoding
          from a <code>meta</code> element</span>, giving the
-         attribute's value as the string to parse. If an encoding is
+         attribute's value as the string to parse. If a character encoding is
          returned, and if <var title="">charset</var> is still set
          to null, let <var title="">charset</var> be the encoding
          returned, and set <var title="">need pragma</var> to
@@ -103482,7 +103482,7 @@
 
   <hr>
 
-  <p>When a user agent would otherwise use an encoding given in the
+  <p>When a user agent would otherwise use a character encoding given in the
   first column of the following table to either convert content to
   Unicode characters or convert Unicode characters to bytes, it must
   instead use the encoding given in the cell in the second column of
@@ -103576,7 +103576,7 @@
   <p>When the parser requires the user agent to <dfn>change the
   encoding</dfn>, it must run the following steps. This might happen
   if the <span>encoding sniffing algorithm</span> described above
-  failed to find an encoding, or if it found an encoding that was not
+  failed to find a character encoding, or if it found a character encoding that was not
   the actual encoding of the file.</p>
 
   <ol>
@@ -107592,7 +107592,7 @@
     value is an <span>ASCII case-insensitive</span> match for the
     string "<code title="">Content-Type</code>", and the element has a
     <code title="attr-meta-content">content</code> attribute, and
-    applying the <span>algorithm for extracting an encoding from a
+    applying the <span>algorithm for extracting a character encoding from a
     <code>meta</code> element</span> to that attribute's value returns
     a supported <span>ASCII-compatible character encoding</span> or
     <span>a UTF-16 encoding</span>, and the <span
@@ -121284,12 +121284,12 @@
      <th> <code title="">charset</code>
      <td> <code title="attr-meta-charset">meta</code>
      <td> <span>Character encoding declaration</span>
-     <td> <span>Preferred MIME name</span> of an encoding*
+     <td> <span>Preferred MIME name</span> of a character encoding*
     <tr>
      <th> <code title="">charset</code>
      <td> <code title="attr-script-charset">script</code>
      <td> Character encoding of the external script resource
-     <td> <span>Preferred MIME name</span> of an encoding*
+     <td> <span>Preferred MIME name</span> of a character encoding*
     <tr>
      <th> <code title="">checked</code>
      <td> <code title="attr-command-checked">command</code>;




More information about the Commit-Watchers mailing list