[html5] r1025 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2007-09-24 18:22:41 -0700 (Mon, 24 Sep 2007)
New Revision: 1025

Modified:
   index
   source
Log:
[e] (0) fix xref problems with 'expected version'

Modified: index
===================================================================
--- index	2007-09-22 02:32:24 UTC (rev 1024)
+++ index	2007-09-25 01:22:41 UTC (rev 1025)
@@ -22,7 +22,7 @@
 
    <h1 id=html-5>HTML 5</h1>
 
-   <h2 class="no-num no-toc" id=working>Working Draft — 22 September
+   <h2 class="no-num no-toc" id=working>Working Draft — 25 September
     2007</h2>
 
    <p>You can take part in this work. <a
@@ -29893,17 +29893,18 @@
 
   <p>The <dfn id=version
    title=dom-database-version><code>version</code></dfn> attribute represents
-   the actual version of the database (as opposed to the <span>expected
-   version</span>).
+   the actual version of the database (as opposed to the <a href="#expected"
+   title=concept-database-expected-version>expected version</a>).
 
   <p>On getting, the attribute must return the current version of the
    database.
 
   <p>On setting, the attribute must wait for all transactions that are trying
    to commit to finish commiting, and then must change the current version of
-   the database and the <span>expected version</span> of the <code><a
-   href="#database0">Database</a></code> object on which the attribute was
-   called to the new value.
+   the database and the <a href="#expected"
+   title=concept-database-expected-version>expected version</a> of the
+   <code><a href="#database0">Database</a></code> object on which the
+   attribute was called to the new value.
 
   <h4 id=executing><span class=secno>4.12.3. </span>Executing SQL statements</h4>
 
@@ -29954,9 +29955,10 @@
      statements that were added to that transaction before it have themselves
      successfully executed. <a href="#refsSQL">[SQL]</a></p>
 
-    <p>If the <code><a href="#database0">Database</a></code> object has an
-     <span>expected version</span> that is neither the empty string nor the
-     actual version of the database, the statement must fail.</p>
+    <p>If the <code><a href="#database0">Database</a></code> object has an <a
+     href="#expected" title=concept-database-expected-version>expected
+     version</a> that is neither the empty string nor the actual version of
+     the database, the statement must fail.</p>
 
    <li>
     <p>Once the statement has executed, let <var title="">result</var> be a
@@ -30147,8 +30149,9 @@
     <tr>
      <td>2
 
-     <td>The statement failed because the <span>expected version</span> of
-      the database didn't match the actual database version.
+     <td>The statement failed because the <a href="#expected"
+      title=concept-database-expected-version>expected version</a> of the
+      database didn't match the actual database version.
   </table>
 
   <p class=big-issue>We should define a more thorough list of codes.

Modified: source
===================================================================
--- source	2007-09-22 02:32:24 UTC (rev 1024)
+++ source	2007-09-25 01:22:41 UTC (rev 1025)
@@ -27347,16 +27347,18 @@
 
   <p>The <dfn title="dom-database-version"><code>version</code></dfn>
   attribute represents the actual version of the database (as opposed
-  to the <span>expected version</span>).</p>
+  to the <span title="concept-database-expected-version">expected
+  version</span>).</p>
 
   <p>On getting, the attribute must return the current version of the
   database.</p>
 
   <p>On setting, the attribute must wait for all transactions that are
   trying to commit to finish commiting, and then must change the
-  current version of the database and the <span>expected
-  version</span> of the <code>Database</code> object on which the
-  attribute was called to the new value.</p>
+  current version of the database and the <span
+  title="concept-database-expected-version">expected version</span> of
+  the <code>Database</code> object on which the attribute was called
+  to the new value.</p>
 
 
 
@@ -27394,11 +27396,19 @@
 
    </li>
 
-   <li><p>If there is an active thread-global transaction, then let
-   <var title="">transaction</var> be that transaction. Otherwise, let
-   begin a new transaction and let <var title="">transaction</var> be
-   that transaction.</p></li>
+   <li>
 
+    <p>If the user agent is currently executing a callback for an
+    earlier invocation of the <code
+    title="dom-database-executeSql">executeSql()</code> method on the
+    same thread, then let <var title="">transaction</var> be the
+    transaction that was being used for that <code
+    title="dom-database-executeSql">executeSql()</code>
+    invocation. Otherwise, begin a new transaction and let <var
+    title="">transaction</var> be that transaction.</p>
+
+   </li>
+
    <li><p>If <var title="">transaction</var> has been marked as "bad",
    then raise an <code>INVALID_STATE_ERR</code> exception.</p></li>
 
@@ -27413,9 +27423,10 @@
     have themselves successfully executed. <a
     href="#refsSQL">[SQL]</a></p>
 
-    <p>If the <code>Database</code> object has an <span>expected
-    version</span> that is neither the empty string nor the actual
-    version of the database, the statement must fail.</p>
+    <p>If the <code>Database</code> object has an <span
+    title="concept-database-expected-version">expected version</span>
+    that is neither the empty string nor the actual version of the
+    database, the statement must fail.</p>
 
    </li>
 
@@ -27605,9 +27616,9 @@
 
     <tr>
      <td>2
-     <td>The statement failed because the <span>expected
-     version</span> of the database didn't match the actual database
-     version.
+     <td>The statement failed because the <span
+     title="concept-database-expected-version">expected version</span>
+     of the database didn't match the actual database version.
 
   </table>