W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2010

html5/markup/src datatypes.html,1.46,1.47 terms.html,1.23,1.24

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 27 Jul 2010 06:09:49 +0000
To: public-html-commits@w3.org
Message-Id: <E1OddML-0002TU-9F@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv9067/src

Modified Files:
	datatypes.html terms.html 
Log Message:
checkpointing some further datatype-documentation changes designed for greater user-friendliness and better alignment with the wording in the HTML5 spec


Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- terms.html	15 Jul 2010 15:36:17 -0000	1.23
+++ terms.html	27 Jul 2010 06:09:47 -0000	1.24
@@ -66,7 +66,7 @@
       defined in the
       <a href="http://dev.w3.org/html5/spec/">HTML5: A vocabulary and associated APIs for HTML and XHTML</a>
       full specification.
-      <a href="references.html#refsHTML5">[HTML5]</a>.
+      <a href="#refsHTML5">[HTML5]</a>.
       <p class="note">This reference does not itself normatively
       define any requirements.</p>
     </dd>
@@ -113,6 +113,15 @@
       </ul>
     </dd>
     <dt><dfn
+        id="top-level-context"
+        title="top-level-context"
+        >top-level browsing context</dfn></dt>
+    <dd>A
+      <a href="#top-level-context">top-level browsing context</a>
+      is as defined in
+      <a href="#refsHTML5">[HTML5]</a>.
+    </dd>
+    <dt><dfn
         id="transparent"
         title="transparent"
         >transparent</dfn></dt>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- datatypes.html	26 Jul 2010 04:06:26 -0000	1.46
+++ datatypes.html	27 Jul 2010 06:09:46 -0000	1.47
@@ -21,6 +21,25 @@
     </ul>
   </div>
   </section>
+  <section id="data-comma-separated-strings-def" class="no-toc">
+    <h2 class="common-subhead"><dfn id="data-comma-separated-strings">Set of comma-separated strings</dfn></h2>
+    <div class="datatype-desc">Zero or more
+      <a href="#data-string">strings</a>
+      that are themselves each zero or more characters, each
+      optionally with leading and/or trailing
+      <a href="#space">space characters</a>,
+      and each separated from the next by a single
+      "<code title="U+002C COMMA">,</code>"
+      (comma) character. Each string itself
+      <a href="#must-requirement">must</a>
+      not begin or end with any
+      <a href="#space">space characters</a>,
+      and each string itself
+      <a href="#must-requirement">must</a>
+      not contain any
+      "<code title="U+002C COMMA">,</code>"
+      (comma) characters.</div>
+  </section>
   <section id="data-token-def" class="no-toc">
     <h2 class="common-subhead"><dfn id="data-token">Token</dfn></h2>
     <div class="datatype-desc">A
@@ -45,11 +64,14 @@
         in which none of the tokens are duplicated.</div>
     </dd>
   </dl>
-  <dl><dt>tokens.comma-separated</dt>
-    <dd><code class="regexp">[^,]+(,[^,]+)*</code></dd>
-  </dl>
-  <dl><dt>character</dt>
-    <dd><a href="#data-string">string</a></dd>
+  <dl><dt>ordered-tokens</dt>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A
+        <a href="#common.data.tokens">set of space-separated tokens</a>
+        in which none of the tokens are duplicated,
+        but in which the order of the tokens is meaningful.</div>
+    </dd>
   </dl>
   <dl><dt>browsing-context-name</dt>
     <dd></dd>
@@ -105,12 +127,14 @@
           <a href="#space">space characters</a></li>
         </ul>
       </div>
-      <p class="note">Previous versions of HTML placed greater
-      restrictions on the content of
-      <a href="#common.data.id">ID</a>
-      values (for example, they did not permit
-      <a href="#common.data.id">ID</a>
-      values to begin with a number).</p>
+      <div class="note">
+        <p>Previous versions of HTML placed greater
+        restrictions on the content of
+        <a href="#common.data.id">ID</a>
+        values (for example, they did not permit
+        <a href="#common.data.id">ID</a>
+        values to begin with a number).</p>
+      </div>
     </dd>
   </dl>
   <dl><dt>idref</dt>
@@ -308,23 +332,23 @@
       </div>
     </dd>
   </dl>
-  <dl><dt>uri</dt>
+  <dl><dt>data-url-no-spaces</dt>
     <dd></dd>
     <dd>
       <div class="datatype-desc">An
         <dfn
           id="data.iri-ref"
           title="data.iri-ref"
-          >IRI-reference</dfn>,
+          >IRI reference</dfn>,
         as defined in RFC 3987
-        <a href="#refsRFC3987">[RFC3987]</a>.
+        <a href="#refsRFC3987">[RFC3987]</a>.</div>
+      <div class="note">
+        <p>The empty string is a valid
+        <a href="#data.iri-ref">IRI reference</a>,
+        so the empty string is allowed anywhere this reference lists
+        <a href="#data-url-no-spaces">URL</a>
+        as being allowed.</p>
       </div>
-      <p class="note">The empty string is a valid
-      <a href="#data.iri-ref">IRI-reference</a>,
-      so the empty string is allowed as the value of any
-      attribute for which this reference lists
-      <a href="#common.data.uri">URI</a>
-      as the allowed datatype.</p>
     </dd>
     <dd>
       <div class="example">
@@ -333,12 +357,33 @@
       </div>
     </dd>
   </dl>
+  <dl><dt>uri</dt>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">An
+        <dfn
+          id="data.iri-ref"
+          title="data.iri-ref"
+          >IRI reference</dfn>,
+        as defined in RFC 3987
+        <a href="#refsRFC3987">[RFC3987]</a>,
+        optionally with leading and/or trailing
+        <a href="#space">space characters</a>.</div>
+      <div class="note">
+        <p>The empty string is a valid
+        <a href="#data.iri-ref">IRI reference</a>,
+        so the empty string is allowed anywhere this reference lists
+        <a href="#common.data.uri">URL potentially surrounded by spaces</a>
+        as being allowed.</p>
+      </div>
+    </dd>
+  </dl>
   <dl><dt>uris</dt>
     <dd></dd>
     <dd>
       <div class="datatype-desc">A
         <a href="#space">space</a>-separated set of zero or more
-        <a href="#data.iri-ref">IRI-reference</a> instances.</div>
+        <a href="#data.iri-ref">IRI reference</a> instances.</div>
     </dd>
   </dl>
   <dl><dt>uri.absolute</dt>
@@ -361,9 +406,8 @@
   <dl><dt>sizes</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">An unordered set of unique
-        space-separated
-        <a href="#data-token">tokens</a>,
+      <div class="datatype-desc">An
+        <a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>,
         each of which
         <a href="#must-requirement">must</a>
         be one of the following:
@@ -459,7 +503,7 @@
               for the string
               "<code>url=</code>".</li>
               <li>A
-              <a href="#common.data.uri">URI</a>.</li>
+              <a href="#data-url-no-spaces">URL</a>.</li>
             </ol>
           </li>
         </ul>
@@ -509,19 +553,21 @@
   <dl><dt>charsetlist</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A set of comma-separated <a href="#data-token">tokens</a>,
-      each of which is a valid <a
-        href="#common.data.charset">character encoding name</a> that specifies an
-      <a href="#ascii-compatible">ASCII-compatible character
-      encoding</a>.</div>
+      <div class="datatype-desc">An
+        <a href="#data-ordered-tokens">ordered set of unique space-separated tokens</a>,
+        each of which
+        <a href="#must-requirement">must</a>
+        be a valid <a
+          href="#common.data.charset">character encoding name</a> that specifies an
+        <a href="#ascii-compatible">ASCII-compatible character encoding</a>.</div>
     </dd>
   </dl>
   <dl><dt>keylabellist</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">An ordered set of unique
-        space-separated <a href="#data-token">tokens</a>, each of
-        which
+      <div class="datatype-desc">An
+        <a href="#data-ordered-tokens">ordered set of unique space-separated tokens</a>,
+        each of which
         <a href="#must-requirement">must</a>
         be exactly one Unicode code point in
         length.</div>
@@ -669,8 +715,9 @@
   <dl><dt>emailaddresslist</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A set of comma-separated <a
-          href="#data-token">tokens</a>, each of which is a valid
+      <div class="datatype-desc">A
+        <a href="#data-comma-separated-tokens">set of unique space-separated tokens</a>,
+        each of which is a valid
       <a href="#form.data.emailaddress">email address</a>.</div>
     </dd>
   </dl>
@@ -711,17 +758,28 @@
   <dl><dt>sandbox-allow-list</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">An unordered set of unique
-        space-separated
-        <a href="#data-token">tokens</a>, each of which is a
+      <div class="datatype-desc">
+        <p>An
+        <a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>,
+        each of which is a
         <a href="#case-insensitive">case-insensitive match</a>
-        for one of the following literal strings:
+        for one of the following literal strings:</p>
         <ul>
-          <li>"<code>allow-same-origin</code>"</li>
           <li>"<code>allow-forms</code>"</li>
           <li>"<code>allow-scripts</code>"</li>
           <li>"<code>allow-top-navigation</code>"</li>
+          <li>"<code>allow-same-origin</code>"</li>
         </ul>
+        <div class="note">
+          <p>Because an
+          <a href="#data-unordered-tokens">unordered set of unique space-separated tokens</a>
+          can contain zero tokens, this datatype also allows the following:</p>
+          <ul>
+            <li>the empty string</li>
+            <li>any string consisting only of 
+            <a href="#space">space characters</a></li>
+          </ul>
+        </div>
       </div>
     </dd>
   </dl>
Received on Tuesday, 27 July 2010 06:09:51 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 27 July 2010 06:09:59 GMT