html5/spec common-microsyntaxes.html,1.56,1.57 infrastructure.html,1.1094,1.1095 offline.html,1.1048,1.1049 spec.html,1.1629,1.1630 the-button-element.html,1.83,1.84 the-iframe-element.html,1.98,1.99 webappapis.html,1.189,1.190

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv31806

Modified Files:
	common-microsyntaxes.html infrastructure.html offline.html 
	spec.html the-button-element.html the-iframe-element.html 
	webappapis.html 
Log Message:
Explain some of the conformance terminology better. (whatwg r6473)

[updated by splitter]


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -d -r1.1094 -r1.1095
--- infrastructure.html	15 Aug 2011 20:47:17 -0000	1.1094
+++ infrastructure.html	16 Aug 2011 04:47:05 -0000	1.1095
@@ -524,6 +524,27 @@
   key word ("must", "should", "may", etc) used in introducing the
   algorithm.</p>
 
+  <div class="example">
+
+   <p>For example, were the spec to say:</p>
+
+   <pre>To eat a kiwi, the user must:
+1. Peel the kiwi.
+2. Eat the kiwi flesh.</pre>
+
+   <p>...it would be equivalent to the following:</p>
+
+   <pre>To eat a kiwi:
+1. The user must peel the kiwi.
+2. The user must eat the kiwi flesh.</pre>
+
+   <p>Here the key word is "must".</p>
+
+   <p>The former (imperative) style is generally preferred in this
+   specification for stylistic reasons.</p>
+
+  </div>
+
   <p>Conformance requirements phrased as algorithms or specific steps
   may be implemented in any manner, so long as the end result is
   equivalent. (In particular, the algorithms defined in this

Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- the-iframe-element.html	16 Aug 2011 01:46:25 -0000	1.98
+++ the-iframe-element.html	16 Aug 2011 04:47:06 -0000	1.99
@@ -6815,12 +6815,32 @@
     <i>monitoring</i>.</p>
 
     <p>If the <a href="fetching-resources.html#fetch" title="fetch">fetching algorithm</a> does not
-    fail, then, when it completes, <a href="webappapis.html#queue-a-task">queue a task</a> to first
-    change the <a href="#text-track-readiness-state">text track readiness state</a> to <a href="#text-track-loaded" title="text track loaded">loaded</a> and then <a href="webappapis.html#fire-a-simple-event">fire a
-    simple event</a> named <code title="event-load">load</code> at
-    the <code><a href="#the-track-element">track</a></code> element; and then, once that <a href="webappapis.html#concept-task" title="concept-task">task</a> is <a href="webappapis.html#queue-a-task" title="queue a
-    task">queued</a>, move on to the step below labeled
-    <i>monitoring</i>.</p>
+    fail, then, when it completes, <a href="webappapis.html#queue-a-task">queue a task</a> to run
+    the following steps:</p>
+
+    <ol><li><p>Change the <a href="#text-track-readiness-state">text track readiness state</a> to
+     <a href="#text-track-loaded" title="text track loaded">loaded</a>.</p></li>
+
+     <li>
+
+      <p>If the file was successfully processed, <a href="webappapis.html#fire-a-simple-event">fire a simple
+      event</a> named <code title="event-load">load</code> at the
+      <code><a href="#the-track-element">track</a></code> element.</p>
+
+      <p>If the file was not successfully processed, e.g. the format
+      in question is an XML format and the file contained a
+      well-formedness error that the XML specification requires be
+      detected and reported to the application, then <a href="webappapis.html#fire-a-simple-event">fire a
+      simple event</a> named <code title="event-error">error</code>
+      at the <code><a href="#the-track-element">track</a></code> element.</p>
+
+      <p class="note">The WebVTT format does not report errors in this
+      fashion.</p>
+
+     </li>
+
+    </ol><p>Once that <a href="webappapis.html#concept-task" title="concept-task">task</a> is <a href="webappapis.html#queue-a-task" title="queue a task">queued</a>, move on to the step below
+    labeled <i>monitoring</i>.</p>
 
     <p>If, while the <a href="fetching-resources.html#fetch" title="fetch">fetching algorithm</a> is
     active, either:</p>

Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.1048
retrieving revision 1.1049
diff -u -d -r1.1048 -r1.1049
--- offline.html	15 Aug 2011 20:47:25 -0000	1.1048
+++ offline.html	16 Aug 2011 04:47:05 -0000	1.1049
@@ -2333,7 +2333,7 @@
   &lt;title&gt;Online status&lt;/title&gt;
   &lt;script&gt;
    function updateIndicator() {
-     document.getElementById('indicator').textContext = navigator.onLine ? 'online' : 'offline';
+     document.getElementById('indicator').textContent = navigator.onLine ? 'online' : 'offline';
    }
   &lt;/script&gt;
  &lt;/head&gt;

Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-button-element.html,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- the-button-element.html	15 Aug 2011 20:47:40 -0000	1.83
+++ the-button-element.html	16 Aug 2011 04:47:06 -0000	1.84
@@ -1951,9 +1951,9 @@
   completion represented by the element. The <dfn id="attr-progress-value" title="attr-progress-value"><code>value</code></dfn> attribute
   specifies how much of the task has been completed, and the <dfn id="attr-progress-max" title="attr-progress-max"><code>max</code></dfn> attribute specifies
   how much work the task requires in total. The units are arbitrary
-  and not specified.</p><p class="note">To make an determinate progress bar, add a <code title="attr-progress-value"><a href="#attr-progress-value">value</a></code> attribute with the current
+  and not specified.</p><p class="note">To make a determinate progress bar, add a <code title="attr-progress-value"><a href="#attr-progress-value">value</a></code> attribute with the current
   progress (either a number from 0.0 to 1.0, or, if the <code title="attr-progress-max"><a href="#attr-progress-max">max</a></code> attribute is specified, a
-  number from 0 to the value of the <code title="attr-progress-max"><a href="#attr-progress-max">max</a></code> attribute. To make an
+  number from 0 to the value of the <code title="attr-progress-max"><a href="#attr-progress-max">max</a></code> attribute). To make an
   indeterminate progress bar, remove the <code title="attr-progress-value"><a href="#attr-progress-value">value</a></code> attribute.</p><p>Authors are encouraged to also include the current value and the
   maximum value inline as text inside the element, so that the
   progress is made available to users of legacy user agents.</p><div class="example">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1629
retrieving revision 1.1630
diff -u -d -r1.1629 -r1.1630
--- spec.html	16 Aug 2011 01:46:25 -0000	1.1629
+++ spec.html	16 Aug 2011 04:47:06 -0000	1.1630
@@ -350,7 +350,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.5169.
+This is revision 1.5175.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2011 <a href="http://www.w3.org/"><abbr title="World Wide

Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- webappapis.html	15 Aug 2011 20:48:01 -0000	1.189
+++ webappapis.html	16 Aug 2011 04:47:06 -0000	1.190
@@ -669,12 +669,14 @@
 
    <dd>
 
-    <p>The function must be invoked with three arguments. The three
-    arguments passed to the function are all <code>DOMString</code>s;
-    the first must give the message that the UA is considering
-    reporting, the second must give the <a href="urls.html#absolute-url">absolute URL</a> of
-    the resource in which the error occurred, and the third must give
-    the line number in that resource on which the error occurred.</p>
+    <p>The function must be invoked with three arguments. The first
+    two arguments passed to the function must be of type
+    <code>DOMString</code>, and the third must be of type
+    <code>unsigned long</code>. The first must give the message that
+    the UA is considering reporting, the second must give the
+    <a href="urls.html#absolute-url">absolute URL</a> of the resource in which the error
+    occurred, and the third must give the line number in that resource
+    on which the error occurred.</p>
 
     <p>If the function returns false, then the error is <i title="concept-error-handled"><a href="#concept-error-handled">handled</a></i>. Otherwise, the error is
     <i title="concept-error-nothandled"><a href="#concept-error-nothandled">not handled</a></i>.</p>
@@ -1197,7 +1199,7 @@
       <dl class="switch"><dt>If the attribute is the <code title="handler-window-onerror"><a href="#handler-window-onerror">onerror</a></code> attribute of the
        <code><a href="browsers.html#window">Window</a></code> object</dt>
 
-       <dd>Let the function have three arguments, named <code title="">event</code>, <code title="">source</code>, and <code title="">fileno</code>.</dd>
+       <dd>Let the function have three arguments, named <code title="">event</code>, <code title="">source</code>, and <code title="">lineno</code>.</dd>
 
        <dt>Otherwise</dt>
 

Index: common-microsyntaxes.html
===================================================================
RCS file: /sources/public/html5/spec/common-microsyntaxes.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- common-microsyntaxes.html	15 Aug 2011 20:47:05 -0000	1.56
+++ common-microsyntaxes.html	16 Aug 2011 04:46:55 -0000	1.57
@@ -354,17 +354,13 @@
 
   <h4 id="common-parser-idioms"><span class="secno">2.5.1 </span>Common parser idioms</h4>
 
-  <p>The <dfn id="space-character" title="space character">space characters</dfn>, for the
+  </div><p>The <dfn id="space-character" title="space character">space characters</dfn>, for the
   purposes of this specification, are U+0020 SPACE, U+0009 CHARACTER
   TABULATION (tab), U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
-  U+000D CARRIAGE RETURN (CR).</p>
-
-  <p>The <dfn id="white_space" title="White_Space">White_Space characters</dfn> are
+  U+000D CARRIAGE RETURN (CR).</p><p>The <dfn id="white_space" title="White_Space">White_Space characters</dfn> are
   those that have the Unicode property "White_Space" in the Unicode
-  <code title="">PropList.txt</code> data file. <a href="references.html#refsUNICODE">[UNICODE]</a></p>
-
-  <p class="note">This should not be confused with the "White_Space"
-  value (abbreviated "WS") of the "Bidi_Class" property in the <code title="">Unicode.txt</code> data file.</p>
+  <code title="">PropList.txt</code> data file. <a href="references.html#refsUNICODE">[UNICODE]</a></p><p class="note">This should not be confused with the "White_Space"
+  value (abbreviated "WS") of the "Bidi_Class" property in the <code title="">Unicode.txt</code> data file.</p><div class="impl">
 
   <p>The <dfn id="alphanumeric-ascii-characters">alphanumeric ASCII characters</dfn> are those in the
   ranges U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9), U+0041 LATIN

Received on Tuesday, 16 August 2011 04:47:22 UTC