Address Yoav's comments

Author: meacer

fetch.bs

@@ -3270,7 +3270,7 @@ steps:
   <li>
     <p>If one or more of the following conditions are met, return without modifying request:
     <ul>
-      <li><p><var>request</var>'s <a for="request">destination</a> is "<code>document</code>"
+      <li><p><var>request</var>'s <a for="request">destination</a> is not "<code>document</code>"
 
       <li><p><var>request</var>'s <a for="request">method</a> is not "<code>GET</code>"
 
@@ -3285,9 +3285,10 @@ steps:
     </ul>
   </li>
 
-  <li><p>If <var>request</var>'s <code>https-upgrade-fallback-url</code> is non-null, this is a
-  fallback request that shouldn't be upgraded again. Clear the <code>https-upgrade</code> and
-  <code>https-upgrade-fallback-url</code> flags and return.
+  <li><p>If <var>request</var>'s <code>https-upgrade-fallback-url</code> is non-null, clear the
+  <code>https-upgrade</code> and <code>https-upgrade-fallback-url</code> flags and return.
+
+  <p class="note">This is a fallback request that shouldn't be upgraded again. 
 
   <li><p>Otherwise, upgrade the request by setting the following fields:
     <ul>
@@ -3300,20 +3301,26 @@ steps:
 
 <h4 id=https-upgrades-fallback>Fallback algorithm</h4>
 
-To <dfn>HTTPS upgrade fallback</dfn> given a <a for=/>request</a>
+To run <dfn>HTTPS upgrade fallback</dfn> given a <a for=/>request</a>
 <var>request</var> and <a for=/>response</a> <var>response</var>, run these steps:
 
 <ol>
-  <li><p>If <var>request</var>'s <code>https-upgrade</code> flag is not set, the <var>request</var>
-  was not upgraded. Return <var>response</var>.
+  <li><p>If <var>request</var>'s <code>https-upgrade</code> flag is not set, return
+  <var>response</var>.
+
+  <p class="note">This means <var>request</var> was not upgraded.
 
   <li>
     <p>Otherwise, the request was upgraded.
 
     <p>If <var>response</var> is a network error, the upgrade failed. Initiate a fallback
-    load by creating a synthetic redirect response <var>fallbackResponse</var> that redirects to
-    <var>request</var>'s <code>https-upgrade-fallback-url</code> flag with status 307.
-    Return <var>fallbackResponse</var>.
+    load by running the following steps:
+
+     <ol>
+      <li><p>Create a synthetic redirect response <var>fallbackResponse</var> that redirects to
+       <var>request</var>'s <code>https-upgrade-fallback-url</code> flag with status 307.
+      <li>Return <var>fallbackResponse</var>.
+     </ol>
 
   <li><p>Otherwise, the upgrade was successful. Return <var>response</var>.
 </ol>
@@ -5243,12 +5250,14 @@ these steps:
      <a>filtered response</a>; otherwise to <var>response</var>'s
      <a for="filtered response">internal response</a>.
 
+     <li><p>If <var>response</var>'s <a for=response>type</a> is "<code>error</code>" then
+      return the result of running <a>HTTPS upgrade fallback</a> given <var>request</var>
+      and a <a>network error</a>.
+
      <li>
       <p>If one of the following is true
 
       <ul class=brief>
-       <li><p><var>response</var>'s <a for=response>type</a> is "<code>error</code>"
-
        <li><p><var>request</var>'s <a for=request>mode</a> is "<code>same-origin</code>" and
        <var>response</var>'s <a for=response>type</a> is "<code>cors</code>"
 
@@ -5262,8 +5271,7 @@ these steps:
        <var>response</var>'s <a for=response>URL list</a> has more than one item.
       </ul>
 
-      <p>then return the result of running <a>HTTPS upgrade fallback</a> given <var>request</var>
-       and a <a>network error</a>.
+      <p>then return a <a>network error</a>.
     </ol>
   </ol>
 
@@ -5330,15 +5338,15 @@ these steps:
   <a>cross-origin resource policy check</a> with <var>request</var>'s <a for=request>origin</a>,
   <var>request</var>'s <a for=request>client</a>, <var>request</var>'s
   <a for=request>destination</a>, and <var>internalResponse</var> returns <b>blocked</b>, then
-  return the result of running <a>HTTPS upgrade fallback</a> given <var>request</var>
-  and a <a>network error</a>.
+  return a <a>network error</a>.
 
   <p class=note>The <a>cross-origin resource policy check</a> runs for responses coming from the
   network and responses coming from the service worker. This is different from the
   <a>CORS check</a>, as <var>request</var>'s <a for=request>client</a> and the service worker can
   have different embedder policies.
 
- <li>Set <var>response</var> and <var>internalResponse</var> to the result of running
+ <li>If <var>request</var>'s <code>https-upgrade</code> flag is set, set <var>response</var> and
+  <var>internalResponse</var> to the result of running
   <a>HTTPS upgrade fallback</a> given <var>request</var> and <var>response</var>.
 
  <li>