Re-merge whatwg#11512 and fix ordering

Author: noamr

source

@@ -96410,15 +96410,15 @@ const p2 = navigation.navigate(url2).finished;</code></pre>
    <li><p>Set <var>navigation</var>'s <span>ongoing <code data-x="event-navigate">navigate</code>
    event</span> to null.</p></li>
 
+   <li><p>If <var>navigation</var>'s <span>ongoing API method tracker</span> is non-null, then
+   <span>reject the finished promise</span> for <var>apiMethodTracker</var> with
+   <var>error</var>.</p></li>
+
    <li><p><span data-x="concept-event-fire">Fire an event</span> named <code
    data-x="event-navigateerror">navigateerror</code> at <var>navigation</var> using
    <code>ErrorEvent</code>, with additional attributes initialized according to
    <var>errorInfo</var>.</p></li>
 
-   <li><p>If <var>navigation</var>'s <span>ongoing API method tracker</span> is non-null, then
-   <span>reject the finished promise</span> for <var>apiMethodTracker</var> with
-   <var>error</var>.</p></li>
-
    <li><p>If <var>navigation</var>'s <span data-x="concept-Navigation-transition">transition</span>
    is null, then return.</p></li>
 
@@ -97460,7 +97460,7 @@ interface <dfn interface>NavigationDestination</dfn> {
       </ol>
 
       <div class="note">
-       <p>If there is an ongoing cross-document navigation, this means it will signaled to the
+       <p>If there is an ongoing cross-document navigation, this means it will be signaled to the
        navigation API as aborted, e.g., by firing <code
        data-x="event-navigateerror">navigateerror</code> events. This is somewhat accurate, since
        the next navigation the <code>Document</code> experiences will be this same-document
@@ -97984,12 +97984,12 @@ interface <dfn interface>NavigationDestination</dfn> {
          <li><p><span data-x="NavigateEvent-finish">Finish</span> <var>event</var> given
          true.</p></li>
 
-         <li><p><span data-x="concept-event-fire">Fire an event</span> named <code
-         data-x="event-navigatesuccess">navigatesuccess</code> at <var>navigation</var>.</p></li>
-
          <li><p>If <var>apiMethodTracker</var> is non-null, then <span>resolve the finished
          promise</span> for <var>apiMethodTracker</var>.</p></li>
 
+         <li><p><span data-x="concept-event-fire">Fire an event</span> named <code
+         data-x="event-navigatesuccess">navigatesuccess</code> at <var>navigation</var>.</p></li>
+
          <li><p>If <var>navigation</var>'s <span
          data-x="concept-Navigation-transition">transition</span> is not null, then resolve
          <var>navigation</var>'s <span data-x="concept-Navigation-transition">transition</span>'s