W3C home > Mailing lists > Public > public-html-commits@w3.org > June 2009

html5/markup datatypes.html,1.10,1.11 spec.html,1.37,1.38

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 16 Jun 2009 10:19:41 +0000
To: public-html-commits@w3.org
Message-Id: <E1MGVlW-0008Nu-0F@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv32121

Modified Files:
	datatypes.html spec.html 
Log Message:
h:tml; did a bit of streamlining in definitions of datatype primitives


Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- datatypes.html	16 Jun 2009 06:49:00 -0000	1.10
+++ datatypes.html	16 Jun 2009 10:19:39 -0000	1.11
@@ -13,40 +13,40 @@
 </div>
 <div id="datatypes" class="section">
         <h2>10. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a></h2>
-        <div id="data-primitives" class="section">
-    <h2>10.1. Datatype primitives <a class="hash" href="#data-primitives">#</a></h2>
-    <p>Some patterns defined in this section reference
-    the following two datatype primitives:</p>
-    <ul>
-      <li>A <dfn id="data-string" title="string">string</dfn>
-      is a sequence of zero or more characters of any
-      kind, including
-      <a href="terminology.html#space">space characters</a>.</li>
-      <li>A <dfn id="data-token" title="token">token</dfn>
-      is a sequence of zero or more characters that
-      does not contain any
-      <a href="terminology.html#space">space characters</a>.</li>
-    </ul>
-    <p>In addition, some patterns reference the
-    <dfn id="data-list" title="data-list">list</dfn>
-    pattern, which is defined as any number of
-    instances of a particular datatype, separated from
-    each another by one or more
-    <a href="terminology.html#space">space characters</a>.</p>
+        <div id="data-string-def" class="section">
+    <h2>10.1. String <a class="hash" href="#data-string-def">#</a></h2>
+    <p>For any pattern in this document that references the <a href="datatypes.html#data-string">string</a> datatype, a
+    <dfn id="data-string" title="string">string</dfn>
+    is defined as any mixture of
+    <a href="syntax.html#syntax-text">text</a>
+    and
+    <a href="syntax.html#syntax-charref">character references</a>
+    that does not contain an
+    <a href="syntax.html#ambiguous">ambiguous ampersand</a>.</p>
+  </div><div id="data-token-def" class="section">
+    <h2>10.2. Token <a class="hash" href="#data-token-def">#</a></h2>
+    <p>For any pattern in this document that references the <a href="datatypes.html#data-token">token</a> datatype, a
+    <dfn id="data-token" title="token">token</dfn>
+    is defined
+    as a <a href="datatypes.html#data-string">string</a> that does not contain
+    any <a href="terminology.html#space">space characters</a>.</p>
   </div>
       <div id="common.data.tokens-mdl" class="section">
-        <h2 class="common-subhead">10.2. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
+        <h2 class="common-subhead">10.3. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-list">list</a> {
-      <a href="datatypes.html#data-token">token</a>* } <a href="datatypes.html#common.data.tokens" class="hash">#</a></div></div>
+          <div><span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.tokens" class="hash">#</a></div>
+      <div class="datatype-desc">A
+        <a href="terminology.html#space">space</a>-separated list of zero or more
+        <a href="datatypes.html#data-token">token</a> instances.</div>
+    </div>
       </div>
       <div id="common.data.browsing-context-mdl" class="section">
-        <h2 class="common-subhead">10.3. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a></h2>
+        <h2 class="common-subhead">10.4. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context">browsing-context</dfn></span><code class="punc"> = </code><code class="regexp">()|([^_].*)</code> <a href="datatypes.html#common.data.browsing-context" class="hash">#</a></div></div>
       </div>
       <div id="common.data.browsing-context-or-keyword-mdl" class="section">
-        <h2 class="common-subhead">10.4. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a></h2>
+        <h2 class="common-subhead">10.5. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-or-keyword" class="hash">#</a></div>
       <div class="datatype-desc">A string that is an
@@ -65,28 +65,31 @@
     </div>
       </div>
       <div id="common.data.id-mdl" class="section">
-        <h2 class="common-subhead">10.5. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
+        <h2 class="common-subhead">10.6. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.id">id</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.id" class="hash">#</a></div></div>
       </div>
       <div id="common.data.idref-mdl" class="section">
-        <h2 class="common-subhead">10.6. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
+        <h2 class="common-subhead">10.7. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idref">idref</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.idref" class="hash">#</a></div></div>
       </div>
       <div id="common.data.idrefs-mdl" class="section">
-        <h2 class="common-subhead">10.7. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
+        <h2 class="common-subhead">10.8. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-list">list</a> {
-      <a href="datatypes.html#common.data.idref">idref</a>+ } <a href="datatypes.html#common.data.idrefs" class="hash">#</a></div></div>
+          <div><span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idrefs" class="hash">#</a></div>
+      <div class="datatype-desc">A
+        <a href="terminology.html#space">space</a>-separated list of one or more
+        <a href="datatypes.html#common.data.idref">idref</a> instances.</div>
+      </div>
       </div>
       <div id="common.data.name-mdl" class="section">
-        <h2 class="common-subhead">10.8. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
+        <h2 class="common-subhead">10.9. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.name">name</dfn></span><code class="punc"> = </code><code class="regexp">\S+</code> <a href="datatypes.html#common.data.name" class="hash">#</a></div></div>
       </div>
       <div id="common.data.hash-name-mdl" class="section">
-        <h2 class="common-subhead">10.9. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
+        <h2 class="common-subhead">10.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code><code class="regexp">#.+</code> <a href="datatypes.html#common.data.hash-name" class="hash">#</a></div>
       <div class="datatype-desc">A valid <dfn id="hash-name">hash-name reference</dfn> to an element of
@@ -97,37 +100,37 @@
     </div>
       </div>
       <div id="common.data.integer-mdl" class="section">
-        <h2 class="common-subhead">10.10. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
+        <h2 class="common-subhead">10.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer">integer</dfn></span><code class="punc"> = </code><code class="regexp">-?[0-9]+</code> <a href="datatypes.html#common.data.integer" class="hash">#</a></div></div>
       </div>
       <div id="common.data.integer.positive-mdl" class="section">
-        <h2 class="common-subhead">10.11. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">10.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.positive">integer.positive</dfn></span><code class="punc"> = </code><code class="regexp">0*[1-9][0-9]*</code> <a href="datatypes.html#common.data.integer.positive" class="hash">#</a></div></div>
       </div>
       <div id="common.data.integer.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.12. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">10.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.non-negative">integer.non-negative</dfn></span><code class="punc"> = </code><code class="regexp">[0-9]+</code> <a href="datatypes.html#common.data.integer.non-negative" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float-mdl" class="section">
-        <h2 class="common-subhead">10.13. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
+        <h2 class="common-subhead">10.14. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float">float</dfn></span><code class="punc"> = </code><code class="regexp">-?((\.[0-9]+)|([0-9]+(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float.positive-mdl" class="section">
-        <h2 class="common-subhead">10.14. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">10.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.positive">float.positive</dfn></span><code class="punc"> = </code><code class="regexp">0*((\.0*[1-9][0-9]*)|([1-9][0-9]*(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float.positive" class="hash">#</a></div></div>
       </div>
       <div id="common.data.float.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.15. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">10.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.non-negative">float.non-negative</dfn></span><code class="punc"> = </code><code class="regexp">((\.[0-9]+)|([0-9]+(\.[0-9]*)?))</code> <a href="datatypes.html#common.data.float.non-negative" class="hash">#</a></div></div>
       </div>
       <div id="common.data.datetime-mdl" class="section">
-        <h2 class="common-subhead">10.16. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
+        <h2 class="common-subhead">10.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.datetime">datetime</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.datetime" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">date-time</b>, as defined in RFC 3339 <a href="references.html#refsRFC3339">[RFC3339]</a>, with these additional
@@ -149,14 +152,14 @@
     </div>
       </div>
       <div id="common.data.date-or-time-mdl" class="section">
-        <h2 class="common-subhead">10.17. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
+        <h2 class="common-subhead">10.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.date-or-time">date-or-time</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a>
       | <a href="datatypes.html#form.data.time">time</a>
       | <a href="datatypes.html#common.data.datetime">datetime</a> <a href="datatypes.html#common.data.date-or-time" class="hash">#</a></div></div>
       </div>
       <div id="common.data.uri-mdl" class="section">
-        <h2 class="common-subhead">10.18. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
+        <h2 class="common-subhead">10.19. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri">uri</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.iri-ref">IRI-reference</a> <a href="datatypes.html#common.data.uri" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.iri-ref">IRI-reference</dfn> is
@@ -169,13 +172,16 @@
     </div>
       </div>
       <div id="common.data.uris-mdl" class="section">
-        <h2 class="common-subhead">10.19. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
+        <h2 class="common-subhead">10.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-list">list</a> {
-      <a href="datatypes.html#data.iri-ref">IRI-reference</a>* } <a href="datatypes.html#common.data.uris" class="hash">#</a></div></div>
+          <div><span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uris" class="hash">#</a></div>
+      <div class="datatype-desc">A
+        <a href="terminology.html#space">space</a>-separated list of zero or more
+        <a href="datatypes.html#data.iri-ref">IRI-reference</a> instances.</div>
+    </div>
       </div>
       <div id="common.data.uri.absolute-mdl" class="section">
-        <h2 class="common-subhead">10.20. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
+        <h2 class="common-subhead">10.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri.absolute">uri.absolute</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.iri">IRI</a> <a href="datatypes.html#common.data.uri.absolute" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.iri">IRI</dfn> is
@@ -190,12 +196,12 @@
     </div>
       </div>
       <div id="common.data.sizes-mdl" class="section">
-        <h2 class="common-subhead">10.21. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
+        <h2 class="common-subhead">10.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.sizes">sizes</dfn></span><code class="punc"> = </code><code class="regexp">[1-9][0-9]*x[1-9][0-9]*</code> <a href="datatypes.html#common.data.sizes" class="hash">#</a></div></div>
       </div>
       <div id="common.data.mimetype-mdl" class="section">
-        <h2 class="common-subhead">10.22. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
+        <h2 class="common-subhead">10.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mimetype">mimetype</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mimetype" class="hash">#</a></div>
       <div class="datatype-desc">A string that identifies a valid
@@ -203,7 +209,7 @@
           defined in RFC 2046 <a href="references.html#refsRFC2046">[RFC2046]</a>.</div> </div>
       </div>
       <div id="common.data.charset-mdl" class="section">
-        <h2 class="common-subhead">10.23. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
+        <h2 class="common-subhead">10.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
@@ -219,7 +225,7 @@
     </div>
       </div>
       <div id="common.data.meta-charset-mdl" class="section">
-        <h2 class="common-subhead">10.24. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
+        <h2 class="common-subhead">10.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.meta-charset">meta-charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.meta-charset" class="hash">#</a></div>
       <div class="datatype-desc">A string that is an <a href="terminology.html#ascii-case-insensitive">ASCII
@@ -229,7 +235,7 @@
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
-        <h2 class="common-subhead">10.25. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
+        <h2 class="common-subhead">10.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.refresh" class="hash">#</a></div>
       <div class="datatype-desc">One of the following:
@@ -244,12 +250,12 @@
     </div>
       </div>
       <div id="common.data.default-style-mdl" class="section">
-        <h2 class="common-subhead">10.26. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
+        <h2 class="common-subhead">10.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-string">string</a> <a href="datatypes.html#common.data.default-style" class="hash">#</a></div></div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
-        <h2 class="common-subhead">10.27. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
+        <h2 class="common-subhead">10.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mediaquery">mediaquery</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mediaquery" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">media query</b>, as defined in
@@ -257,7 +263,7 @@
     </div>
       </div>
       <div id="common.data.langcode-mdl" class="section">
-        <h2 class="common-subhead">10.28. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
+        <h2 class="common-subhead">10.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.language">language-tag</a> <a href="datatypes.html#common.data.langcode" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data.language">language-tag</dfn> is a valid <b class="defined-elsewhere">language tag</b>, as defined
@@ -265,7 +271,7 @@
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
-        <h2 class="common-subhead">10.29. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
+        <h2 class="common-subhead">10.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.keylabellist">keylabellist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.keylabellist" class="hash">#</a></div>
       <div class="datatype-desc">An ordered set of unique
@@ -275,7 +281,7 @@
     </div>
       </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">10.30. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
+        <h2 class="common-subhead">10.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -284,7 +290,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">10.31. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
+        <h2 class="common-subhead">10.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -294,7 +300,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">10.32. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
+        <h2 class="common-subhead">10.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.pattern">pattern</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.pattern" class="hash">#</a></div>
       <div class="datatype-desc">A regular expression that must
@@ -302,7 +308,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">10.33. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
+        <h2 class="common-subhead">10.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a> "<code class="literal">T</code>" <a href="datatypes.html#form.data.time">time</a> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
       <div class="example">
@@ -313,7 +319,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">10.34. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
+        <h2 class="common-subhead">10.35. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.date" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">full-date</b>, as defined in
@@ -329,7 +335,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">10.35. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
+        <h2 class="common-subhead">10.36. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-" <a href="datatypes.html#data-date-month">date-month</a> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-date-month">date-month</dfn> is as defined
@@ -341,7 +347,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">10.36. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
+        <h2 class="common-subhead">10.37. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-W" <a href="datatypes.html#data-date-week">date-week</a> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-date-week">date-week</dfn> is a valid <b class="defined-elsewhere">date-week</b>, as defined
@@ -354,7 +360,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">10.37. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
+        <h2 class="common-subhead">10.38. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.time" class="hash">#</a></div>
       <div class="datatype-desc">A valid <b class="defined-elsewhere">partial-time</b>, as defined
@@ -368,7 +374,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">10.38. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
+        <h2 class="common-subhead">10.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-dot-atom">dot-atom</a> "@" <a href="datatypes.html#data-dot-atom">dot-atom</a> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
       <div class="datatype-desc">&#8230;where <dfn id="data-dot-atom">dot-atom</dfn> is as defined in RFC
@@ -383,7 +389,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">10.39. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
+        <h2 class="common-subhead">10.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
@@ -391,7 +397,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">10.40. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
+        <h2 class="common-subhead">10.41. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code><code class="regexp">#[a-fA-F0-9]{6}</code> <a href="datatypes.html#form.data.color" class="hash">#</a></div></div>
       </div>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- spec.html	16 Jun 2009 06:49:01 -0000	1.37
+++ spec.html	16 Jun 2009 10:19:39 -0000	1.38
@@ -14298,40 +14298,41 @@
     <div id="datatypes" class="section">
         <h2>10. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="#datatypes-toc">T</a>
 </h2>
-        <div id="data-primitives" class="section">
-    <h2>10.1. Datatype primitives <a class="hash" href="#data-primitives">#</a>
+        <div id="data-string-def" class="section">
+    <h2>10.1. String <a class="hash" href="#data-string-def">#</a>
 </h2>
-    <p>Some patterns defined in this section reference
-    the following two datatype primitives:</p>
-    <ul>
-<li>A <dfn id="data-string" title="string">string</dfn>
-      is a sequence of zero or more characters of any
-      kind, including
-      <a href="#space">space characters</a>.</li>
-      <li>A <dfn id="data-token" title="token">token</dfn>
-      is a sequence of zero or more characters that
-      does not contain any
-      <a href="#space">space characters</a>.</li>
-    </ul>
-<p>In addition, some patterns reference the
-    <dfn id="data-list" title="data-list">list</dfn>
-    pattern, which is defined as any number of
-    instances of a particular datatype, separated from
-    each another by one or more
-    <a href="#space">space characters</a>.</p>
+    <p>For any pattern in this document that references the <a href="#data-string">string</a> datatype, a
+    <dfn id="data-string" title="string">string</dfn>
+    is defined as any mixture of
+    <a href="#syntax-text">text</a>
+    and
+    <a href="#syntax-charref">character references</a>
+    that does not contain an
+    <a href="#ambiguous">ambiguous ampersand</a>.</p>
+  </div>
+<div id="data-token-def" class="section">
+    <h2>10.2. Token <a class="hash" href="#data-token-def">#</a>
+</h2>
+    <p>For any pattern in this document that references the <a href="#data-token">token</a> datatype, a
+    <dfn id="data-token" title="token">token</dfn>
+    is defined
+    as a <a href="#data-string">string</a> that does not contain
+    any <a href="#space">space characters</a>.</p>
   </div>
       <div id="common.data.tokens-mdl" class="section">
-        <h2 class="common-subhead">10.2. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a>
+        <h2 class="common-subhead">10.3. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code><a href="#data-list">list</a> {
-      <a href="#data-token">token</a>* } <a href="#common.data.tokens" class="hash">#</a>
-</div>
+<span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code> <a href="#common.data.tokens" class="hash">#</a>
 </div>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of zero or more
+        <a href="#data-token">token</a> instances.</div>
+    </div>
       </div>
       <div id="common.data.browsing-context-mdl" class="section">
-        <h2 class="common-subhead">10.3. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a>
+        <h2 class="common-subhead">10.4. Browsing-context <a class="hash" href="#common.data.browsing-context-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14340,7 +14341,7 @@
 </div>
       </div>
       <div id="common.data.browsing-context-or-keyword-mdl" class="section">
-        <h2 class="common-subhead">10.4. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a>
+        <h2 class="common-subhead">10.5. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14362,7 +14363,7 @@
     </div>
       </div>
       <div id="common.data.id-mdl" class="section">
-        <h2 class="common-subhead">10.5. ID <a class="hash" href="#common.data.id-mdl">#</a>
+        <h2 class="common-subhead">10.6. ID <a class="hash" href="#common.data.id-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14371,7 +14372,7 @@
 </div>
       </div>
       <div id="common.data.idref-mdl" class="section">
-        <h2 class="common-subhead">10.6. IDREF <a class="hash" href="#common.data.idref-mdl">#</a>
+        <h2 class="common-subhead">10.7. IDREF <a class="hash" href="#common.data.idref-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14380,17 +14381,19 @@
 </div>
       </div>
       <div id="common.data.idrefs-mdl" class="section">
-        <h2 class="common-subhead">10.7. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a>
+        <h2 class="common-subhead">10.8. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code><a href="#data-list">list</a> {
-      <a href="#common.data.idref">idref</a>+ } <a href="#common.data.idrefs" class="hash">#</a>
-</div>
+<span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code> <a href="#common.data.idrefs" class="hash">#</a>
 </div>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of one or more
+        <a href="#common.data.idref">idref</a> instances.</div>
+      </div>
       </div>
       <div id="common.data.name-mdl" class="section">
-        <h2 class="common-subhead">10.8. Name <a class="hash" href="#common.data.name-mdl">#</a>
+        <h2 class="common-subhead">10.9. Name <a class="hash" href="#common.data.name-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14399,7 +14402,7 @@
 </div>
       </div>
       <div id="common.data.hash-name-mdl" class="section">
-        <h2 class="common-subhead">10.9. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a>
+        <h2 class="common-subhead">10.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14413,7 +14416,7 @@
     </div>
       </div>
       <div id="common.data.integer-mdl" class="section">
-        <h2 class="common-subhead">10.10. Integer <a class="hash" href="#common.data.integer-mdl">#</a>
+        <h2 class="common-subhead">10.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14422,7 +14425,7 @@
 </div>
       </div>
       <div id="common.data.integer.positive-mdl" class="section">
-        <h2 class="common-subhead">10.11. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a>
+        <h2 class="common-subhead">10.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14431,7 +14434,7 @@
 </div>
       </div>
       <div id="common.data.integer.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.12. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a>
+        <h2 class="common-subhead">10.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14440,7 +14443,7 @@
 </div>
       </div>
       <div id="common.data.float-mdl" class="section">
-        <h2 class="common-subhead">10.13. Float <a class="hash" href="#common.data.float-mdl">#</a>
+        <h2 class="common-subhead">10.14. Float <a class="hash" href="#common.data.float-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14449,7 +14452,7 @@
 </div>
       </div>
       <div id="common.data.float.positive-mdl" class="section">
-        <h2 class="common-subhead">10.14. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a>
+        <h2 class="common-subhead">10.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14458,7 +14461,7 @@
 </div>
       </div>
       <div id="common.data.float.non-negative-mdl" class="section">
-        <h2 class="common-subhead">10.15. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a>
+        <h2 class="common-subhead">10.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14467,7 +14470,7 @@
 </div>
       </div>
       <div id="common.data.datetime-mdl" class="section">
-        <h2 class="common-subhead">10.16. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a>
+        <h2 class="common-subhead">10.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14491,7 +14494,7 @@
     </div>
       </div>
       <div id="common.data.date-or-time-mdl" class="section">
-        <h2 class="common-subhead">10.17. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a>
+        <h2 class="common-subhead">10.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14502,7 +14505,7 @@
 </div>
       </div>
       <div id="common.data.uri-mdl" class="section">
-        <h2 class="common-subhead">10.18. URI <a class="hash" href="#common.data.uri-mdl">#</a>
+        <h2 class="common-subhead">10.19. URI <a class="hash" href="#common.data.uri-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14518,17 +14521,19 @@
     </div>
       </div>
       <div id="common.data.uris-mdl" class="section">
-        <h2 class="common-subhead">10.19. URIs <a class="hash" href="#common.data.uris-mdl">#</a>
+        <h2 class="common-subhead">10.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code><a href="#data-list">list</a> {
-      <a href="#data.iri-ref">IRI-reference</a>* } <a href="#common.data.uris" class="hash">#</a>
-</div>
+<span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code> <a href="#common.data.uris" class="hash">#</a>
 </div>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of zero or more
+        <a href="#data.iri-ref">IRI-reference</a> instances.</div>
+    </div>
       </div>
       <div id="common.data.uri.absolute-mdl" class="section">
-        <h2 class="common-subhead">10.20. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a>
+        <h2 class="common-subhead">10.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14546,7 +14551,7 @@
     </div>
       </div>
       <div id="common.data.sizes-mdl" class="section">
-        <h2 class="common-subhead">10.21. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a>
+        <h2 class="common-subhead">10.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14555,7 +14560,7 @@
 </div>
       </div>
       <div id="common.data.mimetype-mdl" class="section">
-        <h2 class="common-subhead">10.22. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a>
+        <h2 class="common-subhead">10.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14566,7 +14571,7 @@
           defined in RFC 2046 <a href="#refsRFC2046">[RFC2046]</a>.</div> </div>
       </div>
       <div id="common.data.charset-mdl" class="section">
-        <h2 class="common-subhead">10.23. Charset <a class="hash" href="#common.data.charset-mdl">#</a>
+        <h2 class="common-subhead">10.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14585,7 +14590,7 @@
     </div>
       </div>
       <div id="common.data.meta-charset-mdl" class="section">
-        <h2 class="common-subhead">10.24. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a>
+        <h2 class="common-subhead">10.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14598,7 +14603,7 @@
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
-        <h2 class="common-subhead">10.25. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a>
+        <h2 class="common-subhead">10.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14617,7 +14622,7 @@
     </div>
       </div>
       <div id="common.data.default-style-mdl" class="section">
-        <h2 class="common-subhead">10.26. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a>
+        <h2 class="common-subhead">10.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14626,7 +14631,7 @@
 </div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
-        <h2 class="common-subhead">10.27. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a>
+        <h2 class="common-subhead">10.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14637,7 +14642,7 @@
     </div>
       </div>
       <div id="common.data.langcode-mdl" class="section">
-        <h2 class="common-subhead">10.28. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a>
+        <h2 class="common-subhead">10.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14648,7 +14653,7 @@
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
-        <h2 class="common-subhead">10.29. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a>
+        <h2 class="common-subhead">10.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14661,7 +14666,7 @@
     </div>
       </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">10.30. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
+        <h2 class="common-subhead">10.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14673,7 +14678,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">10.31. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
+        <h2 class="common-subhead">10.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14686,7 +14691,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">10.32. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
+        <h2 class="common-subhead">10.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14697,7 +14702,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">10.33. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
+        <h2 class="common-subhead">10.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14711,7 +14716,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">10.34. Date <a class="hash" href="#form.data.date-mdl">#</a>
+        <h2 class="common-subhead">10.35. Date <a class="hash" href="#form.data.date-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14730,7 +14735,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">10.35. Month <a class="hash" href="#form.data.month-mdl">#</a>
+        <h2 class="common-subhead">10.36. Month <a class="hash" href="#form.data.month-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14745,7 +14750,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">10.36. Week <a class="hash" href="#form.data.week-mdl">#</a>
+        <h2 class="common-subhead">10.37. Week <a class="hash" href="#form.data.week-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14761,7 +14766,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">10.37. Time <a class="hash" href="#form.data.time-mdl">#</a>
+        <h2 class="common-subhead">10.38. Time <a class="hash" href="#form.data.time-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14778,7 +14783,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">10.38. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
+        <h2 class="common-subhead">10.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14796,7 +14801,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">10.39. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
+        <h2 class="common-subhead">10.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -14807,7 +14812,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">10.40. Color <a class="hash" href="#form.data.color-mdl">#</a>
+        <h2 class="common-subhead">10.41. Color <a class="hash" href="#form.data.color-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
Received on Tuesday, 16 June 2009 10:19:52 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 16 June 2009 10:19:52 GMT