Bug 25624: use standard promise language as recommended by TAG
authorMark Watson <watsonm@netflix.com>
Fri, 26 Sep 2014 10:02:03 -0700
changeset 240 dfa57faee835
parent 239 417ccc8bf5ae
child 241 52cea848d2e6
Bug 25624: use standard promise language as recommended by TAG
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Fri Sep 26 09:40:49 2014 -0700
+++ b/spec/Overview-WebCryptoAPI.xml	Fri Sep 26 10:02:03 2014 -0700
@@ -1319,7 +1319,7 @@
           <h3>Methods and Parameters</h3>
           <div class="note">
             <p>
-              All errors are reported asynchronously by calling the reject handler of the returned
+              All errors are reported asynchronously by rejecting the returned
               Promise. This includes Web IDL type mapping errors.
             </p>
           </div>
@@ -1365,8 +1365,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1378,8 +1377,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1410,8 +1409,7 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>ciphertext</var> as <var>value</var>.
+                  Resolve <var>promise</var> with <var>ciphertext</var>.
                 </p>
               </li>
             </ol>
@@ -1458,8 +1456,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1471,8 +1468,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1504,8 +1501,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>plaintext</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>plaintext</var>.
                 </p>
               </li>
             </ol>
@@ -1551,8 +1548,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1564,8 +1560,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1596,8 +1592,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1649,8 +1645,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1662,8 +1657,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1695,8 +1690,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1740,8 +1735,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1753,8 +1747,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1768,8 +1762,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1808,8 +1802,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1821,8 +1814,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1843,8 +1836,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1896,8 +1889,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1909,8 +1901,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1983,8 +1975,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2023,8 +2015,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise object.
                 </p>
               </li>
               <li>
@@ -2036,8 +2027,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2069,8 +2060,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2108,8 +2099,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2170,8 +2160,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2215,8 +2205,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2249,8 +2239,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2262,8 +2251,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2302,8 +2291,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2349,8 +2338,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2362,8 +2350,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2508,8 +2496,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2581,8 +2569,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2594,8 +2581,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2703,8 +2690,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2714,7 +2701,7 @@
           <h3>Exceptions</h3>
           <p>
             The methods of the <a href="#dfn-SubtleCrypto">SubtleCrypto</a> interface return errors
-            by calling the reject handler of the returned promise with a
+            by rejecting the returned promise with a
             <a href="#dfn-DOMException">DOMException</a>. The following DOMException types from
             [<a href="#DOM4">DOM4</a>] are used with messages as shown in the following table:
           </p>
--- a/spec/Overview.html	Fri Sep 26 09:40:49 2014 -0700
+++ b/spec/Overview.html	Fri Sep 26 10:02:03 2014 -0700
@@ -1313,7 +1313,7 @@
           <h3>15.3. Methods and Parameters</h3>
           <div class="note"><div class="noteHeader">Note</div>
             <p>
-              All errors are reported asynchronously by calling the reject handler of the returned
+              All errors are reported asynchronously by rejecting the returned
               Promise. This includes Web IDL type mapping errors.
             </p>
           </div>
@@ -1359,8 +1359,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1372,8 +1371,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1401,8 +1400,7 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>ciphertext</var> as <var>value</var>.
+                  Resolve <var>promise</var> with <var>ciphertext</var>.
                 </p>
               </li>
             </ol>
@@ -1449,8 +1447,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1462,8 +1459,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1492,8 +1489,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>plaintext</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>plaintext</var>.
                 </p>
               </li>
             </ol>
@@ -1538,8 +1535,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1551,8 +1547,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1580,8 +1576,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1632,8 +1628,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1645,8 +1640,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1675,8 +1670,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1720,8 +1715,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1733,8 +1727,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1748,8 +1742,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as <var>value</var>.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1788,8 +1782,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1801,8 +1794,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1823,8 +1816,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1875,8 +1868,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -1888,8 +1880,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -1958,8 +1950,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -1998,8 +1990,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise object.
                 </p>
               </li>
               <li>
@@ -2011,8 +2002,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2042,8 +2033,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2078,8 +2069,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2140,8 +2130,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2185,8 +2175,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2216,8 +2206,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2229,8 +2218,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2265,8 +2254,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2311,8 +2300,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2324,8 +2312,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2464,8 +2452,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2536,8 +2524,7 @@
               </li>
               <li>
                 <p>
-                  Let <var>promise</var> be a new Promise object and <var>resolver</var> its
-                  associated resolver object.
+                  Let <var>promise</var> be a new Promise.
                 </p>
               </li>
               <li>
@@ -2549,8 +2536,8 @@
                 <p>
                   If the following steps or referenced procedures say to
                   <a href="#concept-return-an-error">return an error</a>,
-                  execute <var>resolver</var>'s <code>reject(value)</code> algorithm, with
-                  the returned error as the <code>value</code> argument and then
+                  reject <var>promise</var> with
+                  the returned error and then
                   <a href="#terminate-the-algorithm">terminate the algorithm.</a>
                 </p>
               </li>
@@ -2656,8 +2643,8 @@
               </li>
               <li>
                 <p>
-                  Execute <var>resolver</var>'s <code>resolve(value)</code> algorithm, with
-                  <var>result</var> as the <code>value</code> argument.
+                  Resolve <var>promise</var> with
+                  <var>result</var>.
                 </p>
               </li>
             </ol>
@@ -2667,7 +2654,7 @@
           <h3>15.4. Exceptions</h3>
           <p>
             The methods of the <a href="#dfn-SubtleCrypto">SubtleCrypto</a> interface return errors
-            by calling the reject handler of the returned promise with a
+            by rejecting the returned promise with a
             <a href="#dfn-DOMException">DOMException</a>. The following DOMException types from
             [<a href="#DOM4">DOM4</a>] are used with messages as shown in the following table:
           </p>