[html5] r1568 - /

whatwg at whatwg.org whatwg at whatwg.org
Thu May 8 16:07:45 PDT 2008


Author: ianh
Date: 2008-05-08 16:07:44 -0700 (Thu, 08 May 2008)
New Revision: 1568

Modified:
   index
   source
Log:
[e] (0) Excise the term 'entity' from the specification (as far as the text/html syntax goes). They are now 'character references'. You put them on your resume.

Modified: index
===================================================================
--- index	2008-05-08 22:50:20 UTC (rev 1567)
+++ index	2008-05-08 23:07:44 UTC (rev 1568)
@@ -1625,7 +1625,7 @@
         </ul>
 
        <li><a href="#character"><span class=secno>8.1.4 </span>Character
-        entity references</a>
+        references</a>
 
        <li><a href="#cdata"><span class=secno>8.1.5 </span>CDATA blocks</a>
 
@@ -1673,7 +1673,7 @@
         </span>Tokenisation</a>
         <ul class=toc>
          <li><a href="#tokenising"><span class=secno>8.2.4.1.
-          </span>Tokenising entities</a>
+          </span>Tokenising character references</a>
         </ul>
 
        <li><a href="#tree-construction"><span class=secno>8.2.5 </span>Tree
@@ -1763,7 +1763,8 @@
      <li><a href="#parsing2"><span class=secno>8.5 </span>Parsing HTML
       fragments</a>
 
-     <li><a href="#entities"><span class=secno>8.6 </span>Entities</a>
+     <li><a href="#named"><span class=secno>8.6 </span>Named character
+      references</a>
     </ul>
 
    <li><a href="#rendering"><span class=secno>9. </span>Rendering and
@@ -8411,8 +8412,9 @@
     href="#refsIANACHARSET">[IANACHARSET]</a> <!-- XXX
    http://www.iana.org/assignments/character-sets -->
 
-   <li>The encoding name must be serialised without the use of character
-    entity references or character escapes of any kind.
+   <li>The encoding name must be serialised without the use of <a
+    href="#character3" title=syntax-charref>character references</a> or
+    character escapes of any kind.
   </ul>
 
   <p>If the document does not start with a BOM, and if its encoding is not
@@ -24685,7 +24687,7 @@
      not defined on the data provider (thus disabling sorting for that data
      grid, but still letting the user interact with the data). If the method
      is not defined, then the return value must be assumed to be the same as
-     the second argument (an indentity transform; the data is rendered in its
+     the second argument (an identity transform; the data is rendered in its
      natural order).</p>
 
    <dt>To establish what classes apply to a row
@@ -39891,8 +39893,8 @@
    described below.
 
   <p>RCDATA elements can have <a href="#text2" title=syntax-text>text</a> and
-   <a href="#character3" title=syntax-entities>character entity
-   references</a>, but the text must not contain an <a href="#ambiguous"
+   <a href="#character3" title=syntax-charref>character references</a>, but
+   the text must not contain an <a href="#ambiguous"
    title=syntax-ambiguous-ampersand>ambiguous ampersand</a>. There are also
    <a href="#cdata-rcdata-restrictions">further restrictions</a> described
    below.
@@ -39902,7 +39904,7 @@
    between the start tag and the end tag). Foreign elements whose start tag
    is <em>not</em> marked as self-closing can have <a href="#text2"
    title=syntax-text>text</a>, <a href="#character3"
-   title=syntax-entities>character entity references</a>, <a href="#cdata0"
+   title=syntax-charref>character references</a>, <a href="#cdata0"
    title=syntax-cdata>CDATA blocks</a>, other <a href="#elements2"
    title=syntax-elements>elements</a>, and <a href="#comments0"
    title=syntax-comments>comments</a>, but the text must not contain the
@@ -39911,8 +39913,8 @@
    ampersand</a>.
 
   <p>Normal elements can have <a href="#text2" title=syntax-text>text</a>, <a
-   href="#character3" title=syntax-entities>character entity references</a>,
-   other <a href="#elements2" title=syntax-elements>elements</a>, and <a
+   href="#character3" title=syntax-charref>character references</a>, other <a
+   href="#elements2" title=syntax-elements>elements</a>, and <a
    href="#comments0" title=syntax-comments>comments</a>, but the text must
    not contain the character U+003C LESS-THAN SIGN (<code><</code>) or an
    <a href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
@@ -40007,8 +40009,8 @@
 
   <p><dfn id=attribute0 title=syntax-attribute-value>Attribute values</dfn>
    are a mixture of <a href="#text2" title=syntax-text>text</a> and <a
-   href="#character3" title=syntax-entities>character entity references</a>,
-   except with the additional restriction that the text cannot contain an <a
+   href="#character3" title=syntax-charref>character references</a>, except
+   with the additional restriction that the text cannot contain an <a
    href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
    ampersand</a>.
 
@@ -40384,27 +40386,27 @@
    FEED (LF) characters, or pairs of U+000D CARRIAGE RETURN (CR), U+000A LINE
    FEED (LF) characters in that order.
 
-  <h4 id=character><span class=secno>8.1.4 </span>Character entity references</h4>
+  <h4 id=character><span class=secno>8.1.4 </span>Character references</h4>
 
   <p>In certain cases described in other sections, <a href="#text2"
    title=syntax-text>text</a> may be mixed with <dfn id=character3
-   title=syntax-entities>character entity references</dfn>. These can be used
-   to escape characters that couldn't otherwise legally be included in <a
+   title=syntax-charref>character references</dfn>. These can be used to
+   escape characters that couldn't otherwise legally be included in <a
    href="#text2" title=syntax-text>text</a>.
 
-  <p>Character entity references must start with a U+0026 AMPERSAND
+  <p>Character references must start with a U+0026 AMPERSAND
    (<code>&</code>). Following this, there are three possible kinds of
-   character entity references:
+   character references:
 
   <dl>
-   <dt>Named entities
+   <dt>Named character references
 
    <dd>The ampersand must be followed by one of the names given in the <a
-    href="#entities0">entities</a> section, using the same case. The name
-    must be one that is terminated by a U+003B SEMICOLON (<code
-    title="">;</code>) character.
+    href="#named0">named character references</a> section, using the same
+    case. The name must be one that is terminated by a U+003B SEMICOLON
+    (<code title="">;</code>) character.
 
-   <dt>Decimal numeric entities
+   <dt>Decimal numeric character reference
 
    <dd>The ampersand must be followed by a U+0023 NUMBER SIGN
     (<code>#</code>) character, followed by one or more digits in the range
@@ -40414,7 +40416,7 @@
     The digits must then be followed by a U+003B SEMICOLON character (<code
     title="">;</code>).
 
-   <dt>Hexadecimal numeric entities
+   <dt>Hexadecimal numeric character reference
 
    <dd>The ampersand must be followed by a U+0023 NUMBER SIGN
     (<code>#</code>) character, which must be followed by either a U+0078
@@ -41702,7 +41704,8 @@
 
      <dd>When the <a href="#content2">content model flag</a> is set to one of
       the PCDATA or RCDATA states and the <a href="#escape">escape flag</a>
-      is false: switch to the <a href="#entity">entity data state</a>.
+      is false: switch to the <a href="#character4">character reference data
+      state</a>.
 
      <dd>Otherwise: treat it as per the "anything else" entry below.
 
@@ -41759,14 +41762,14 @@
       href="#data-state">data state</a>.
     </dl>
 
-   <dt><dfn id=entity>Entity data state</dfn>
+   <dt><dfn id=character4>Character reference data state</dfn>
 
    <dd>
     <p><em>(This cannot happen if the <a href="#content2">content model
      flag</a> is set to the CDATA state.)</em></p>
 
-    <p>Attempt to <a href="#consume">consume an entity</a>, with no <a
-     href="#additional">additional allowed character</a>.</p>
+    <p>Attempt to <a href="#consume">consume a character reference</a>, with
+     no <a href="#additional">additional allowed character</a>.</p>
 
     <p>If nothing is returned, emit a U+0026 AMPERSAND character token.</p>
 
@@ -42208,8 +42211,8 @@
 
      <dt>U+0026 AMPERSAND (&)
 
-     <dd>Switch to the <a href="#entity0">entity in attribute value
-      state</a>, with the <a href="#additional">additional allowed
+     <dd>Switch to the <a href="#character5">character reference in attribute
+      value state</a>, with the <a href="#additional">additional allowed
       character</a> being U+0022 QUOTATION MARK (").
 
      <dt>EOF
@@ -42237,8 +42240,8 @@
 
      <dt>U+0026 AMPERSAND (&)
 
-     <dd>Switch to the <a href="#entity0">entity in attribute value
-      state</a>, with the <a href="#additional">additional allowed
+     <dd>Switch to the <a href="#character5">character reference in attribute
+      value state</a>, with the <a href="#additional">additional allowed
       character</a> being U+0027 APOSTROPHE (').
 
      <dt>EOF
@@ -42274,8 +42277,8 @@
 
      <dt>U+0026 AMPERSAND (&)
 
-     <dd>Switch to the <a href="#entity0">entity in attribute value
-      state</a>, with no <a href="#additional">additional allowed
+     <dd>Switch to the <a href="#character5">character reference in attribute
+      value state</a>, with no <a href="#additional">additional allowed
       character</a>.
 
      <dt>U+003E GREATER-THAN SIGN (>)
@@ -42303,10 +42306,10 @@
       Stay in the <a href="#attribute4">attribute value (unquoted) state</a>.
     </dl>
 
-   <dt><dfn id=entity0>Entity in attribute value state</dfn>
+   <dt><dfn id=character5>Character reference in attribute value state</dfn>
 
    <dd>
-    <p>Attempt to <a href="#consume">consume an entity</a>.</p>
+    <p>Attempt to <a href="#consume">consume a character reference</a>.</p>
 
     <p>If nothing is returned, append a U+0026 AMPERSAND character to the
      current attribute's value.</p>
@@ -43069,12 +43072,14 @@
     <p>If the end of the file was reached, reconsume the EOF character.</p>
   </dl>
 
-  <h5 id=tokenising><span class=secno>8.2.4.1. </span>Tokenising entities</h5>
+  <h5 id=tokenising><span class=secno>8.2.4.1. </span>Tokenising character
+   references</h5>
 
-  <p>This section defines how to <dfn id=consume>consume an entity</dfn>.
-   This definition is used when parsing entities <a href="#entity"
-   title="entity data state">in text</a> and <a href="#entity0" title="entity
-   in attribute value state">in attributes</a>.
+  <p>This section defines how to <dfn id=consume>consume a character
+   reference</dfn>. This definition is used when parsing character references
+   <a href="#character4" title="character reference data state">in text</a>
+   and <a href="#character5" title="character reference in attribute value
+   state">in attributes</a>.
 
   <p>The behavior depends on the identity of the next character (the one
    immediately after the U+0026 AMPERSAND character):
@@ -43100,8 +43105,8 @@
    <dt>The <dfn id=additional>additional allowed character</dfn>, if there is
     one
 
-   <dd>Not an entity. No characters are consumed, and nothing is returned.
-    (This is not an error, either.)
+   <dd>Not a character reference. No characters are consumed, and nothing is
+    returned. (This is not an error, either.)
 
    <dt>U+0023 NUMBER SIGN (#)
 
@@ -43412,7 +43417,7 @@
    <dd>
     <p>Consume the maximum number of characters possible, with the consumed
      characters case-sensitively matching one of the identifiers in the first
-     column of the <a href="#entities0">entities</a> table.</p>
+     column of the <a href="#named0">named character references</a> table.</p>
 
     <p>If no match can be made, then this is a <a href="#parse1">parse
      error</a>. No characters are consumed, and nothing is returned.</p>
@@ -43420,25 +43425,27 @@
     <p>If the last character matched is not a U+003B SEMICOLON (<code
      title="">;</code>), there is a <a href="#parse1">parse error</a>.</p>
 
-    <p>If the entity is being consumed <a href="#entity0" title="entity in
-     attribute value state">as part of an attribute</a>, and the last
-     character matched is not a U+003B SEMICOLON (<code title="">;</code>),
-     and the next character is in the range U+0030 DIGIT ZERO to U+0039 DIGIT
-     NINE, U+0041 LATIN CAPITAL LETTER A to U+005A LATIN CAPITAL LETTER Z, or
-     U+0061 LATIN SMALL LETTER A to U+007A LATIN SMALL LETTER Z, then, for
-     historical reasons, all the characters that were matched after the
-     U+0026 AMPERSAND (&) must be unconsumed, and nothing is returned.</p>
+    <p>If the character reference is being consumed <a href="#character5"
+     title="character reference in attribute value state">as part of an
+     attribute</a>, and the last character matched is not a U+003B SEMICOLON
+     (<code title="">;</code>), and the next character is in the range U+0030
+     DIGIT ZERO to U+0039 DIGIT NINE, U+0041 LATIN CAPITAL LETTER A to U+005A
+     LATIN CAPITAL LETTER Z, or U+0061 LATIN SMALL LETTER A to U+007A LATIN
+     SMALL LETTER Z, then, for historical reasons, all the characters that
+     were matched after the U+0026 AMPERSAND (&) must be unconsumed, and
+     nothing is returned.</p>
 
     <p>Otherwise, return a character token for the character corresponding to
-     the entity name (as given by the second column of the <a
-     href="#entities0">entities</a> table).</p>
+     the character reference name (as given by the second column of the <a
+     href="#named0">named character references</a> table).</p>
 
     <div class=example>
      <p>If the markup contains <code title="">I'm &notit; I tell
-      you</code>, the entity is parsed as "not", as in, <code title="">I'm
-      ¬it; I tell you</code>. But if the markup was <code title="">I'm
-      &notin; I tell you</code>, the entity would be parsed as "notin;",
-      resulting in <code title="">I'm ∉ I tell you</code>.</p>
+      you</code>, the character reference is parsed as "not", as in, <code
+      title="">I'm ¬it; I tell you</code>. But if the markup was <code
+      title="">I'm &notin; I tell you</code>, the character reference
+      would be parsed as "notin;", resulting in <code title="">I'm ∉ I
+      tell you</code>.</p>
     </div>
   </dl>
 
@@ -47425,18 +47432,18 @@
      document order.</p>
   </ol>
 
-  <h3 id=entities><span class=secno>8.6 </span><dfn
-   id=entities0>Entities</dfn></h3>
+  <h3 id=named><span class=secno>8.6 </span><dfn id=named0>Named character
+   references</dfn></h3>
 
-  <p>This table lists the entity names that are supported by HTML, and the
-   code points to which they refer. It is referenced by the previous
-   sections.
+  <p>This table lists the character reference names that are supported by
+   HTML, and the code points to which they refer. It is referenced by the
+   previous sections.
 
   <div class=tall-and-narrow>
    <table>
     <thead>
      <tr>
-      <th> Entity Name
+      <th> Name
 
       <th> Character
 
@@ -49579,10 +49586,10 @@
      <tr> <td> <code title="">zwnj;</code> </td> <td> U+0200C </td> </tr>
    </table>
    <!--
-   If we want to add entities, Almorca suggests:
-   > I would add the entity sub1; (character U+2081), the entity sub2;
-   > (character U+2082) and the entity sub3; (character U+2083). They
-   > would are the equivalent to sup1; , sup2, and sup3;.
+   If we want to add character references, Almorca suggests:
+   > I would add &sub1; (character U+2081), &sub2;
+   > (character U+2082) and &sub3; (character U+2083). They
+   > would are the equivalent to &sup1;, &sup2;, and &sup3;.
    See also: http://www.w3.org/2003/entities/
   -->
    </div>

Modified: source
===================================================================
--- source	2008-05-08 22:50:20 UTC (rev 1567)
+++ source	2008-05-08 23:07:44 UTC (rev 1568)
@@ -6814,8 +6814,9 @@
    href="#refsIANACHARSET">[IANACHARSET]</a> <!-- XXX
    http://www.iana.org/assignments/character-sets --></li>
 
-   <li>The encoding name must be serialised without the use of
-   character entity references or character escapes of any kind.</li>
+   <li>The encoding name must be serialised without the use of <span
+   title="syntax-charref">character references</span> or character
+   escapes of any kind.</li>
 
   </ul>
 
@@ -22468,7 +22469,7 @@
     sorting for that data grid, but still letting the user interact
     with the data). If the method is not defined, then the return
     value must be assumed to be the same as the second argument (an
-    indentity transform; the data is rendered in its natural
+    identity transform; the data is rendered in its natural
     order).</p>
 
    </dd>
@@ -37479,8 +37480,8 @@
   described below.</p>
 
   <p>RCDATA elements can have <span title="syntax-text">text</span>
-  and <span title="syntax-entities">character entity
-  references</span>, but the text must not contain an <span
+  and <span title="syntax-charref">character references</span>, but
+  the text must not contain an <span
   title="syntax-ambiguous-ampersand">ambiguous ampersand</span>.
   There are also <a href="#cdata-rcdata-restrictions">further
   restrictions</a> described below.</p>
@@ -37490,7 +37491,7 @@
   can be put between the start tag and the end tag). Foreign elements
   whose start tag is <em>not</em> marked as self-closing can have
   <span title="syntax-text">text</span>, <span
-  title="syntax-entities">character entity references</span>, <span
+  title="syntax-charref">character references</span>, <span
   title="syntax-cdata">CDATA blocks</span>, other <span
   title="syntax-elements">elements</span>, and <span
   title="syntax-comments">comments</span>, but the text must not
@@ -37499,8 +37500,8 @@
   ampersand</span>.</p>
 
   <p>Normal elements can have <span title="syntax-text">text</span>,
-  <span title="syntax-entities">character entity references</span>,
-  other <span title="syntax-elements">elements</span>, and <span
+  <span title="syntax-charref">character references</span>, other
+  <span title="syntax-elements">elements</span>, and <span
   title="syntax-comments">comments</span>, but the text must not
   contain the character U+003C LESS-THAN SIGN (<code><</code>) or
   an <span title="syntax-ambiguous-ampersand">ambiguous
@@ -37604,10 +37605,9 @@
 
   <p><dfn title="syntax-attribute-value">Attribute values</dfn> are a
   mixture of <span title="syntax-text">text</span> and <span
-  title="syntax-entities">character entity references</span>, except
-  with the additional restriction that the text cannot contain an
-  <span title="syntax-ambiguous-ampersand">ambiguous
-  ampersand</span>.</p>
+  title="syntax-charref">character references</span>, except with the
+  additional restriction that the text cannot contain an <span
+  title="syntax-ambiguous-ampersand">ambiguous ampersand</span>.</p>
 
   <p>Attributes can be specified in four different ways:</p>
 
@@ -37991,29 +37991,29 @@
   U+000A LINE FEED (LF) characters in that order.</p>
 
 
-  <h4>Character entity references</h4>
+  <h4>Character references</h4>
 
   <p>In certain cases described in other sections, <span
   title="syntax-text">text</span> may be mixed with <dfn
-  title="syntax-entities">character entity references</dfn>. These can
-  be used to escape characters that couldn't otherwise legally be
-  included in <span title="syntax-text">text</span>.</p>
+  title="syntax-charref">character references</dfn>. These can be used
+  to escape characters that couldn't otherwise legally be included in
+  <span title="syntax-text">text</span>.</p>
 
-  <p>Character entity references must start with a U+0026 AMPERSAND
+  <p>Character references must start with a U+0026 AMPERSAND
   (<code>&</code>). Following this, there are three possible kinds
-  of character entity references:</p>
+  of character references:</p>
 
   <dl>
 
-   <dt>Named entities</dt>
+   <dt>Named character references</dt>
 
    <dd>The ampersand must be followed by one of the names given in the
-   <span>entities</span> section, using the same case. The name must
-   be one that is terminated by a U+003B SEMICOLON (<code
-   title="">;</code>) character.</dd>
+   <span>named character references</span> section, using the same
+   case. The name must be one that is terminated by a U+003B SEMICOLON
+   (<code title="">;</code>) character.</dd>
 
 
-   <dt>Decimal numeric entities</dt>
+   <dt>Decimal numeric character reference</dt>
 
    <dd>The ampersand must be followed by a U+0023 NUMBER SIGN
    (<code>#</code>) character, followed by one or more digits in the
@@ -38024,7 +38024,7 @@
    a U+003B SEMICOLON character (<code title="">;</code>).</dd>
 
 
-   <dt>Hexadecimal numeric entities</dt>
+   <dt>Hexadecimal numeric character reference</dt>
 
    <dd>The ampersand must be followed by a U+0023 NUMBER SIGN
    (<code>#</code>) character, which must be followed by either a
@@ -39340,8 +39340,9 @@
      <dt>U+0026 AMPERSAND (&)</dt>
      <dd>When the <span>content model flag</span> is set to one of the
      PCDATA or RCDATA states and the <span>escape flag</span> is
-     false: switch to the <span>entity data state</span>.</dd>
-     <dd>Otherwise: treat it as per the "anything else" entry below.</dd>
+     false: switch to the <span>character reference data
+     state</span>.</dd> <dd>Otherwise: treat it as per the "anything
+     else" entry below.</dd>
 
      <dt>U+002D HYPHEN-MINUS (-)</dt>
      <dd>
@@ -39398,14 +39399,14 @@
 
    </dd>
 
-   <dt><dfn>Entity data state</dfn></dt>
+   <dt><dfn>Character reference data state</dfn></dt>
 
    <dd>
 
     <p><em>(This cannot happen if the <span>content model flag</span>
     is set to the CDATA state.)</em></p>
 
-    <p>Attempt to <span>consume an entity</span>, with no
+    <p>Attempt to <span>consume a character reference</span>, with no
     <span>additional allowed character</span>.</p>
 
     <p>If nothing is returned, emit a U+0026 AMPERSAND character
@@ -39813,9 +39814,9 @@
      state</span>.</dd>
 
      <dt>U+0026 AMPERSAND (&)</dt>
-     <dd>Switch to the <span>entity in attribute value state</span>,
-     with the <span>additional allowed character</span> being U+0022
-     QUOTATION MARK (").</dd>
+     <dd>Switch to the <span>character reference in attribute value
+     state</span>, with the <span>additional allowed character</span>
+     being U+0022 QUOTATION MARK (").</dd>
 
      <dt>EOF</dt>
      <dd><span>Parse error</span>. Emit the current tag
@@ -39844,9 +39845,9 @@
      state</span>.</dd>
 
      <dt>U+0026 AMPERSAND (&)</dt>
-     <dd>Switch to the <span>entity in attribute value state</span>,
-     with the <span>additional allowed character</span> being U+0027
-     APOSTROPHE (').</dd>
+     <dd>Switch to the <span>character reference in attribute value
+     state</span>, with the <span>additional allowed character</span>
+     being U+0027 APOSTROPHE (').</dd>
 
      <dt>EOF</dt>
      <dd><span>Parse error</span>. Emit the current tag
@@ -39879,8 +39880,9 @@
      <dd>Switch to the <span>before attribute name state</span>.</dd>
 
      <dt>U+0026 AMPERSAND (&)</dt>
-     <dd>Switch to the <span>entity in attribute value state</span>,
-     with no <span>additional allowed character</span>.</dd>
+     <dd>Switch to the <span>character reference in attribute value
+     state</span>, with no <span>additional allowed
+     character</span>.</dd>
 
      <dt>U+003E GREATER-THAN SIGN (>)</dt>
      <dd>Emit the current tag token. Switch to the <span>data
@@ -39906,11 +39908,11 @@
 
    </dd>
 
-   <dt><dfn>Entity in attribute value state</dfn></dt>
+   <dt><dfn>Character reference in attribute value state</dfn></dt>
 
    <dd>
 
-    <p>Attempt to <span>consume an entity</span>.</p>
+    <p>Attempt to <span>consume a character reference</span>.</p>
 
     <p>If nothing is returned, append a U+0026 AMPERSAND character to
     the current attribute's value.</p>
@@ -40655,11 +40657,12 @@
   </dl>
 
 
-  <h5>Tokenising entities</h5>
+  <h5>Tokenising character references</h5>
 
-  <p>This section defines how to <dfn>consume an entity</dfn>. This
-  definition is used when parsing entities <span title="entity data
-  state">in text</span> and <span title="entity in attribute value
+  <p>This section defines how to <dfn>consume a character
+  reference</dfn>. This definition is used when parsing character
+  references <span title="character reference data state">in
+  text</span> and <span title="character reference in attribute value
   state">in attributes</span>.</p>
 
   <p>The behavior depends on the identity of the next character (the
@@ -40678,8 +40681,8 @@
    <dt>EOF</dt>
    <dt>The <dfn>additional allowed character</dfn>, if there is one</dt>
 
-   <dd>Not an entity. No characters are consumed, and nothing is
-   returned. (This is not an error, either.)</dd>
+   <dd>Not a character reference. No characters are consumed, and
+   nothing is returned. (This is not an error, either.)</dd>
 
 
    <dt>U+0023 NUMBER SIGN (#)</dt>
@@ -40806,8 +40809,8 @@
 
     <p>Consume the maximum number of characters possible, with the
     consumed characters case-sensitively matching one of the
-    identifiers in the first column of the <span>entities</span>
-    table.</p>
+    identifiers in the first column of the <span>named character
+    references</span> table.</p>
 
     <p>If no match can be made, then this is a <span>parse
     error</span>. No characters are consumed, and nothing is
@@ -40816,28 +40819,30 @@
     <p>If the last character matched is not a U+003B SEMICOLON (<code
     title="">;</code>), there is a <span>parse error</span>.</p>
 
-    <p>If the entity is being consumed <span title="entity in
-    attribute value state">as part of an attribute</span>, and the
-    last character matched is not a U+003B SEMICOLON (<code
-    title="">;</code>), and the next character is in the range U+0030
-    DIGIT ZERO to U+0039 DIGIT NINE, U+0041 LATIN CAPITAL LETTER A to
-    U+005A LATIN CAPITAL LETTER Z, or U+0061 LATIN SMALL LETTER A to
-    U+007A LATIN SMALL LETTER Z, then, for historical reasons, all the
-    characters that were matched after the U+0026 AMPERSAND (&)
-    must be unconsumed, and nothing is returned.</p>
+    <p>If the character reference is being consumed <span
+    title="character reference in attribute value state">as part of an
+    attribute</span>, and the last character matched is not a U+003B
+    SEMICOLON (<code title="">;</code>), and the next character is in
+    the range U+0030 DIGIT ZERO to U+0039 DIGIT NINE, U+0041 LATIN
+    CAPITAL LETTER A to U+005A LATIN CAPITAL LETTER Z, or U+0061 LATIN
+    SMALL LETTER A to U+007A LATIN SMALL LETTER Z, then, for
+    historical reasons, all the characters that were matched after the
+    U+0026 AMPERSAND (&) must be unconsumed, and nothing is
+    returned.</p>
 
     <p>Otherwise, return a character token for the character
-    corresponding to the entity name (as given by the second column of
-    the <span>entities</span> table).</p>
+    corresponding to the character reference name (as given by the
+    second column of the <span>named character references</span>
+    table).</p>
 
     <div class="example">
 
      <p>If the markup contains <code title="">I'm &notit; I tell
-     you</code>, the entity is parsed as "not", as in, <code
-     title="">I'm ¬it; I tell you</code>. But if the markup was
-     <code title="">I'm &notin; I tell you</code>, the entity
-     would be parsed as "notin;", resulting in <code title="">I'm
-     ∉ I tell you</code>.</p>
+     you</code>, the character reference is parsed as "not", as in,
+     <code title="">I'm ¬it; I tell you</code>. But if the markup
+     was <code title="">I'm &notin; I tell you</code>, the
+     character reference would be parsed as "notin;", resulting in
+     <code title="">I'm ∉ I tell you</code>.</p>
 
     </div>
 
@@ -44824,26 +44829,26 @@
 
 
 
-  <h3><dfn>Entities</dfn></h3>
+  <h3><dfn>Named character references</dfn></h3>
 
-  <p>This table lists the entity names that are supported by HTML, and
-  the code points to which they refer. It is referenced by the previous
-  sections.</p>
+  <p>This table lists the character reference names that are supported
+  by HTML, and the code points to which they refer. It is referenced
+  by the previous sections.</p>
 
   <div class="tall-and-narrow">
    <table>
     <thead>
-     <tr> <th> Entity Name </th> <th> Character </th> </tr>
+     <tr> <th> Name </th> <th> Character </th> </tr>
     </thead>
     <tbody>
-<!--ENTITIES-->
+<!--CHARACTER-REFERENCES-->
     </tbody>
    </table>
   <!--
-   If we want to add entities, Almorca suggests:
-   > I would add the entity sub1; (character U+2081), the entity sub2;
-   > (character U+2082) and the entity sub3; (character U+2083). They
-   > would are the equivalent to sup1; , sup2, and sup3;.
+   If we want to add character references, Almorca suggests:
+   > I would add &sub1; (character U+2081), &sub2;
+   > (character U+2082) and &sub3; (character U+2083). They
+   > would are the equivalent to &sup1;, &sup2;, and &sup3;.
    See also: http://www.w3.org/2003/entities/
   -->
   </div>




More information about the Commit-Watchers mailing list