Merge WHATWG change: s/cancel/terminate/ for now
authorJungkee Song <jungkee.song@samsung.com>
Wed, 23 Oct 2013 11:49:58 +0900
changeset 130 d7b20b946622
parent 129 8d92671a852f
child 131 2ef0b8cebba5
Merge WHATWG change: s/cancel/terminate/ for now
Overview.html
Overview.src.html
data/xrefs/dom/xhr.json
--- a/Overview.html	Wed Oct 23 11:43:26 2013 +0900
+++ b/Overview.html	Wed Oct 23 11:49:58 2013 +0900
@@ -728,7 +728,7 @@
 
 <hr>
 
-<p>To <dfn id="cancel-the-request">cancel the request</dfn> run these steps:
+<p>To <dfn id="terminate-the-request">terminate the request</dfn> run these steps:
 
 <ol>
  <li><p>Set the <a href="#error-flag">error flag</a>.
@@ -878,7 +878,7 @@
  "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidaccesserror">InvalidAccessError</a></code>" exception.
 
  <li>
-  <p><a href="#cancel-the-request">Cancel the request</a>.
+  <p><a href="#terminate-the-request">Terminate the request</a>.
 
   <p class="note">After all, a request can be ongoing at this point. 
 
@@ -1734,7 +1734,7 @@
   steps:</p>
 
   <ol>
-   <li><p><a href="#cancel-the-request">Cancel the request</a>. 
+   <li><p><a href="#terminate-the-request">Terminate the request</a>.
 
    <li><p>Change the state to <a href="#dom-xmlhttprequest-done" title="dom-XMLHttpRequest-DONE">DONE</a>.</li>
 
@@ -1874,7 +1874,7 @@
 these steps (unless otherwise noted):
 
   <ol>
-   <li><p><a href="#cancel-the-request">Cancel the request</a>. 
+   <li><p><a href="#terminate-the-request">Terminate the request</a>.
 
    <li>
     <p>If the state is <a href="#dom-xmlhttprequest-unsent" title="dom-XMLHttpRequest-UNSENT">UNSENT</a>,
--- a/Overview.src.html	Wed Oct 23 11:43:26 2013 +0900
+++ b/Overview.src.html	Wed Oct 23 11:49:58 2013 +0900
@@ -737,7 +737,7 @@
 
 <hr>
 
-<p>To <dfn>cancel the request</dfn> run these steps:
+<p>To <dfn>terminate the request</dfn> run these steps:
 
 <ol>
  <li><p>Set the <span>error flag</span>.
@@ -887,7 +887,7 @@
  "<code data-anolis-spec=dom>InvalidAccessError</code>" exception.
 
  <li>
-  <p><span>Cancel the request</span>.
+  <p><span>Terminate the request</span>.
 
   <p class=note>After all, a request can be ongoing at this point. 
 
@@ -1743,7 +1743,7 @@
   steps:</p>
 
   <ol>
-   <li><p><span>Cancel the request</span>. 
+   <li><p><span>Terminate the request</span>.
 
    <li><p>Change the state to <span title="dom-XMLHttpRequest-DONE">DONE</span>.</p></li>
 
@@ -1883,7 +1883,7 @@
 these steps (unless otherwise noted):
 
   <ol>
-   <li><p><span>Cancel the request</span>. 
+   <li><p><span>Terminate the request</span>.
 
    <li>
     <p>If the state is <span title="dom-XMLHttpRequest-UNSENT">UNSENT</span>,
--- a/data/xrefs/dom/xhr.json	Wed Oct 23 11:43:26 2013 +0900
+++ b/data/xrefs/dom/xhr.json	Wed Oct 23 11:49:58 2013 +0900
@@ -5,7 +5,6 @@
     "arraybuffer response entity body": "arraybuffer-response-entity-body",
     "author request headers": "author-request-headers",
     "blob response entity body": "blob-response-entity-body",
-    "cancel the request": "cancel-the-request",
     "concept-response-header": "concept-response-header",
     "concept-xmlhttprequest-document": "concept-xmlhttprequest-document",
     "cross-origin request event rules": "cross-origin-request-event-rules",
@@ -78,6 +77,7 @@
     "switch to the headers_received state": "switch-headers-received",
     "switch to the loading state": "switch-loading",
     "synchronous flag": "synchronous-flag",
+    "terminate the request": "terminate-the-request",
     "text response entity body": "text-response-entity-body",
     "timeout error": "timeout-error",
     "upload complete flag": "upload-complete-flag",