HTML Standard Tracker

Filter

File a bug

SVNBugCommentTime (UTC)
2338[Gecko] [Webkit] [Google Gears] Remove opportunistic caching; leave only the fallback feature.2008-10-16 00:33
@@ -36092,22 +36092,22 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
      <li><p><span title="parse a url">Parse</span> <var
      title="">url</var>.</p></li>
 
      <li><p>If <var title="">url</var> does not use a server-based
      naming authority, or if parsing <var title="">url</var> failed,
      or if <var title="">url</var> is not an <span>absolute
      URL</span>, then return a new globally unique
      identifier.</p></li>
 
      <li><p>Let <var title="">scheme</var> be the <span
-     title="url-scheme">&lt;scheme&gt;</span> component of the URI,
-     <span>converted to lowercase</span>.</p></li>
+     title="url-scheme">&lt;scheme&gt;</span> component of <var
+     title="">url</var>, <span>converted to lowercase</span>.</p></li>
 
      <li><p>If the UA doesn't support the protocol given by <var
      title="">scheme</var>, then return a new globally unique
      identifier.</p></li>
 
      <li><p>If <var title="">scheme</var> is "<code
      title="">file</code>", then the user agent may return a
      UA-specific value.</p></li>
 
      <li><p>Let <var title="">host</var> be the <span
@@ -38232,21 +38232,21 @@ JSURL: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t
 
   <ol>
 
    <li>The user registers a third-party content handler as the default
    handler for a content type.</li>
 
    <li>The user then browses his corporate Intranet site and accesses
    a document that uses that content type.</li>
 
    <li>The user agent contacts the third party and hands the third
-   party the URI to the Intranet content.</li>
+   party the URL to the Intranet content.</li>
 
   </ol>
 
   <p>No actual confidential file data is leaked in this manner, but
   the URLs themselves could contain confidential information. For
   example, the URL could be
   <code>http://www.corp.example.com/upcoming-aquisitions/the-sample-company.egf</code>,
   which might tell the third party that Example Corporation is
   intending to merge with The Sample Company. Implementors might wish
   to consider allowing administrators to disable this feature for
@@ -38451,55 +38451,45 @@ JSURL: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t
      title="concept-appcache-manifest">manifest</span>.
 
  
      <dt><dfn title="concept-appcache-fallback">Fallback entries</dfn>
 
      <dd>Resources that were listed in the cache's <span
      title="concept-appcache-manifest">manifest</span> as fallback
      entries.
 
  
-     <dt><dfn title="concept-appcache-oppcache">Opportunistically cached entries</dfn>
-
-     <dd>Resources whose URLs <span
-     title="concept-appcache-matches-oppcache">matched</span> an <span
-     title="concept-appcache-oppcache-ns">opportunistic caching
-     namespace</span> when they were fetched, and were therefore
-     cached in the application cache.
-
- 
      <dt><dfn title="concept-appcache-dynamic">Dynamic entries</dfn>
 
      <dd>Resources that were added to the cache by the <code
      title="dom-appcache-add">add()</code> method.
 
     </dl>
 
     <p class="note">A URL in the list can be flagged with multiple
     different types, and thus an entry can end up being categorized as
     multiple entries. For example, an entry can be an explicit entry
     and a dynamic entry at the same time.</p>
 
    </li>
 
-   <li>Zero or more <dfn
-   title="concept-appcache-oppcache-ns">opportunistic caching
+   <li>Zero or more <dfn title="concept-appcache-fallback-ns">fallback
    namespaces</dfn>: URLs, used as <span
-   title="concept-appcache-matches-oppcache">prefix match
+   title="concept-appcache-matches-fallback">prefix match
    patterns</span>, each of which is mapped to a <span
    title="concept-appcache-fallback">fallback entry</span>. Each
-   namespace URL prefix, when parsed as a URL, has the <span>same
-   origin</span> as <span title="concept-appcache-manifest">the
-   manifest</span>.</li>
+   namespace URL has the <span>same origin</span> as <span
+   title="concept-appcache-manifest">the manifest</span>.</li>
 
    <li>Zero or more URLs that form the <dfn
-   title="concept-appcache-onlinewhitelist">online whitelist</dfn>.
+   title="concept-appcache-onlinewhitelist">online whitelist
+   namespaces</dfn>.
 
   </ul>
 
   <p>Multiple application caches can contain the same resource,
   e.g. if their manifests all reference that resource. If the user
   agent is to <dfn title="concept-appcache-selection">select an
   application cache</dfn> from a list of caches that contain a
   resource, that the user agent must use the application cache that
   the user most likely wants to see the resource from, taking into
   account the following:</p>
@@ -38652,45 +38642,39 @@ style/default.css</pre>
     <p class="note">The URLs in data lines can't be empty strings,
     since those would be relative URLs to the manifest itself. Such
     lines would be confused with blank or invalid lines, anyway.</p>
 
   </dl>
 
   <p>Manifests may contain sections more than once. Sections may be
   empty.</p>
 
   <p>URLs that are to be fallback pages associated with <span
-  title="concept-appcache-oppcache-ns">opportunistic caching
-  namespaces</span>, and those namespaces themselves, must be given in
-  fallback sections, with the namespace being the first URL of the
-  data line, and the corresponding fallback page being the second
-  URL. All the other pages to be cached must be listed in explicit
-  sections.</p>
+  title="concept-appcache-fallback-ns">fallback namespaces</span>, and
+  those namespaces themselves, must be given in fallback sections,
+  with the namespace being the first URL of the data line, and the
+  corresponding fallback page being the second URL. All the other
+  pages to be cached must be listed in explicit sections.</p>
 
-  <p><span title="concept-appcache-oppcache-ns">Opportunistic caching
+  <p><span title="concept-appcache-fallback-ns">Fallback
   namespaces</span> must have the <span>same origin</span> as the
   manifest itself.</p>
 
-  <p>An opportunistic caching namespace must not be listed more than
-  once.</p>
+  <p>A <span title="concept-appcache-fallback-ns">fallback
+  namespace</span> must not be listed more than once.</p>
 
   <p>URLs that the user agent is to put into the <span
   title="concept-appcache-onlinewhitelist">online whitelist</span>
   must all be specified in online whitelist sections. (This is needed
   for any URL that the page is intending to use to communicate back to
   the server.)</p>
 
-  <p>URLs in the online whitelist section must not also be listed in
-  explicit section, and must not be listed as fallback entries in the
-  fallback section. (URLs in the online whitelist section may match
-  opportunistic caching namespaces, however.)</p>
-
   <p>Relative URLs must be given relative to the manifest's own
   URL.</p>
 
   <p>URLs in manifests must not have fragment identifiers (i.e. the
   U+0023 NUMBER SIGN character isn't allowed in URLs in
   manifests).</p>
 
 
   <h5>Parsing cache manifests</h5>
 
@@ -38705,22 +38689,22 @@ style/default.css</pre>
    a U+FFFD REPLACEMENT CHARACTER. <!--All U+0000 NULL characters must
    be replaced by U+FFFD REPLACEMENT CHARACTERs. (this isn't black-box
    testable since neither U+0000 nor U+FFFD are valid anywhere in the
    syntax and thus both will be treated the same anyway)--></p></li>
 
    <li><p>Let <var title="">explicit URLs</var> be an initially empty
    list of <span title="concept-appcache-explicit">explicit
    entries</span>.</p></li>
 
    <li><p>Let <var title="">fallback URLs</var> be an initially empty
-   mapping of <span title="concept-appcache-oppcache-ns">opportunistic
-   caching namespaces</span> to <span
+   mapping of <span title="concept-appcache-fallback-ns">fallback
+   namespaces</span> to <span
    title="concept-appcache-fallback">fallback entries</span>.</p></li>
 
    <li><p>Let <var title="">online whitelist URLs</var> be an
    initially empty list of URLs for a <span
    title="concept-appcache-onlinewhitelist">online
    whitelist</span>.</p></li>
 
    <li><p>Let <var title="">input</var> be the decoded text of the
    manifest's byte stream.</p></li>
 
@@ -38901,31 +38885,30 @@ style/default.css</pre>
       manifest's URL (compared in an <span>ASCII
       case-insensitive</span> manner), then jump back to the step
       labeled "start of line".</p>
 
       <p>Drop any the <span
       title="url-fragment">&lt;fragment&gt;</span> components of the
       resulting <span title="absolute URL">absolute URLs</span>.</p>
 
       <p>If the <span>absolute URL</span> corresponding to <var
       title="">part one</var> is already in the <var title="">fallback
-      URIs</var> mapping as an <span
-      title="concept-appcache-oppcache-ns">opportunistic caching
-      namespace</span>, then jump back to the step labeled "start of
-      line".</p>
+      URLs</var> mapping as a <span
+      title="concept-appcache-fallback-ns">fallback namespace</span>,
+      then jump back to the step labeled "start of line".</p>
 
       <p>Otherwise, add the <span>absolute URL</span> corresponding to
       <var title="">part one</var> to the <var title="">fallback
-      URIs</var> mapping as an <span
-      title="concept-appcache-oppcache-ns">opportunistic caching
-      namespace</span>, mapped to the <span>absolute URL</span>
-      corresponding to <var title="">part two</var> as the <span
+      URLs</var> mapping as a <span
+      title="concept-appcache-fallback-ns">fallback namespace</span>,
+      mapped to the <span>absolute URL</span> corresponding to <var
+      title="">part two</var> as the <span
       title="concept-appcache-fallback">fallback entry</span>.</p>
 
      </dd>
 
      <dt>If <var title="">mode</var> is "online whitelist"</dt>
 
      <dd>
 
       <p><span title="resolve a url">Resolve</span> the first item in
       <var title="">tokens</var>; ignore the rest.</p>
@@ -38963,26 +38946,25 @@ style/default.css</pre>
    <li><p>Jump back to the step labeled "start of line". (That step
    jumps to the next, and last, step when the end of the file is
    reached.)</p></li>
 
    <li><p>Return the <var title="">explicit URLs</var> list, the <var
    title="">fallback URLs</var> mapping, and the <var title="">online
    whitelist URLs</var>.</p></li>
 
   </ol>
 
-  <p class="note">If a resource is listed in both the online whitelist
-  and in the explicit section, then that resource will be fetched and
-  cached, but when the page tries to use this resource, the user agent
-  will ignore the cached copy and attempt to fetch the file from the
-  network. Indeed, the cached copy will only be used if it is opened
-  from a top-level browsing context.</p>
+  <p class="note">If a resource is listed in the explicit section and
+  matches an entry in the online whitelist, or if a resource matches
+  both an entry in the fallback section and the online whitelist, the
+  resource will taken from the cache, and the online whitelist entry
+  will be ignored.</p>
 
 
   <h4>Updating an application cache</h4>
 
   <p>When the user agent is required (by other parts of this
   specification) to start the <dfn>application cache update
   process</dfn>, the user agent must run the following steps:</p>
 
   <p class="XXX">the event stuff needs to be more consistent --
   something about showing every step of the ui or no steps or
@@ -39053,23 +39035,23 @@ style/default.css</pre>
     <p><span>Fetch</span> the resource from <var title="">manifest
     URL</var>, and let <var title="">manifest</var> be that
     resource.</p>
 
     <p>If the resource is labeled with the MIME type <code
     title="">text/cache-manifest</code>, parse <var
     title="">manifest</var> according to the <span title="parse a
     manifest">rules for parsing manifests</span>, obtaining a list of
     <span title="concept-appcache-explicit">explicit entries</span>,
     <span title="concept-appcache-fallback">fallback entries</span>
-    and the <span title="concept-appcache-oppcache-ns">opportunistic
-    caching namespaces</span> that map to them, and entries for the
-    <span title="concept-appcache-onlinewhitelist">online
+    and the <span title="concept-appcache-fallback-ns">fallback
+    namespaces</span> that map to them, and entries for the <span
+    title="concept-appcache-onlinewhitelist">online
     whitelist</span>.</p>
 
    </li>
 
    <li>
 
     <p>If the previous step fails (e.g. the server returns a 4xx or
     5xx response or equivalent, or there is a DNS error, or the
     connection times out, or the user cancels the download, or the
     parser for manifests fails when checking the magic signature), or
@@ -39145,30 +39127,20 @@ style/default.css</pre>
    by parsing <var title="">manifest</var> to <var title="">file
    list</var>, each flagged with "explicit entry".</p></li>
 
    <li><p>Add all the URLs in the list of <span
    title="concept-appcache-fallback">fallback entries</span> obtained
    by parsing <var title="">manifest</var> to <var title="">file
    list</var>, each flagged with "fallback entry".</p></li>
 
    <li><p>If this is an <span title="concept-appcache-upgrade">upgrade
    attempt</span>, then add all the URLs of <span
-   title="concept-appcache-oppcache">opportunistically cached
-   entries</span> in <var title="">cache</var> that <span
-   title="concept-appcache-matches-oppcache">match</span> the <span
-   title="concept-appcache-oppcache-ns">opportunistic caching
-   namespaces</span> obtained by parsing <var title="">manifest</var>
-   to <var title="">file list</var>, each flagged with "opportunistic
-   entry".</p></li>
-
-   <li><p>If this is an <span title="concept-appcache-upgrade">upgrade
-   attempt</span>, then add all the URLs of <span
    title="concept-appcache-implicit">implicit entries</span> in <var
    title="">cache</var> to <var title="">file list</var>, each flagged
    with "implicit entry".</p></li>
 
    <li><p>If this is an <span title="concept-appcache-upgrade">upgrade
    attempt</span>, then add all the URLs of <span
    title="concept-appcache-dynamic">dynamic entries</span> in <var
    title="">cache</var> to <var title="">file list</var>, each flagged
    with "dynamic entry".</p></li>
 
@@ -39230,48 +39202,42 @@ style/default.css</pre>
      <li><p>If the URL being processed was flagged as an "explicit
      entry" in <var title="">file list</var>, then categorize the
      entry as an <span title="concept-appcache-explicit">explicit
      entry</span>.</p></li>
 
      <li><p>If the URL being processed was flagged as a "fallback
      entry" in <var title="">file list</var>, then categorize the
      entry as a <span title="concept-appcache-fallback">fallback
      entry</span>.</p></li>
 
-     <li><p>If the URL being processed was flagged as a "opportunistic
-     entry" in <var title="">file list</var>, then categorize the
-     entry as an <span
-     title="concept-appcache-oppcache">opportunistically cached
-     entry</span>.</p></li>
-
      <li><p>If the URL being processed was flagged as an "implicit
      entry" in <var title="">file list</var>, then categorize the
      entry as a <span title="concept-appcache-implicit">implicit
      entry</span>.</p></li>
 
      <li><p>If the URL being processed was flagged as an "dynamic
      entry" in <var title="">file list</var>, then categorize the
      entry as a <span title="concept-appcache-dynamic">dynamic
      entry</span>.</p></li>
 
     </ol>
 
    </li>
 
    <li><p>Store <var title="">manifest</var> in <var title="">new
    cache</var>, if it's not there already, and categorize this entry
    (whether newly added or not) as <span
    title="concept-appcache-manifest">the manifest</span>.</p></li>
 
    <li><p>Store the list of <span
-   title="concept-appcache-oppcache-ns">opportunistic caching
-   namespaces</span>, and the URLs of the <span
+   title="concept-appcache-fallback-ns">fallback namespaces</span>,
+   and the URLs of the <span
    title="concept-appcache-fallback">fallback entries</span> that they
    map to, in the new cache.</p></li>
 
    <li><p>Store the URLs that form the new <span
    title="concept-appcache-onlinewhitelist">online whitelist</span> in
    the new cache.</p></li>
 
    <li>
 
     <p>Wait for all pending downloads of <span title="implicit
@@ -39363,42 +39329,42 @@ style/default.css</pre>
 
 
 
   <h4>Processing model</h4>
 
   <p>The processing model of application caches for offline support in
   Web applications is part of the <span
   title="navigate">navigation</span> model, but references the
   algorithms defined in this section.</p>
 
-  <p>A URL <dfn title="concept-appcache-matches-oppcache">matches an
-  opportunistic caching namespace</dfn> if there exists an
-  <span>application cache</span> whose <span
+  <p>A URL <dfn title="concept-appcache-matches-fallback">matches a
+  fallback namespace</dfn> if there exists an <span>application
+  cache</span> whose <span
   title="concept-appcache-manifest">manifest</span>'s URL has the
   <span>same origin</span> as the URL in question, and if that
-  application cache has an <span
-  title="concept-appcache-oppcache-ns">opportunistic caching
-  namespace</span> with a <span title="url-path">&lt;path&gt;</span>
-  component that exactly matches the start of the <span
+  application cache has a <span
+  title="concept-appcache-fallback-ns">fallback namespace</span> with
+  a <span title="url-path">&lt;path&gt;</span> component that is a
+  <span>prefix match</span> for the <span
   title="url-path">&lt;path&gt;</span> component of the URL being
-  examined. If multiple opportunistic caching namespaces match the
-  same URL, the one with the longest &lt;path&gt; component is the one
-  that matches. A URL looking for an opportunistic caching namespace
-  can match more than one application cache at a time, but only
-  matches one namespace in each cache.</p>
+  examined. If multiple fallback namespaces match the same URL, the
+  one with the longest <span title="url-path">&lt;path&gt;</span> component is the one
+  that matches. A URL looking for an fallback namespace can match more
+  than one application cache at a time, but only matches one namespace
+  in each cache.</p>
 
   <div class="example">
 
    <p>If a manifest <code
    title="">http://example.com/app1/manifest</code> declares that
-   <code title="">http://example.com/resources/images</code> should be
-   opportunistically cached, and the user navigates to <code
+   <code title="">http://example.com/resources/images</code> is a
+   fallback namespace, and the user navigates to <code
    title="">http://example.com/resources/images/cat.png</code>, then
    the user agent will decide that the application cache identified by
    <code title="">http://example.com/app1/manifest</code> contains a
    namespace with a match for that URL.</p>
 
   </div>
 
   <p>When the <dfn
   title="concept-appcache-init-with-attribute">application cache
   selection algorithm</dfn> algorithm is invoked with a manifest URL,
@@ -39553,54 +39519,52 @@ style/default.css</pre>
   <ol>
 
    <li><p>If the resource is not to be fetched using the HTTP GET
    mechanism or equivalent, then <span>fetch</span> the resource
    normally and abort these steps.</p></li>
 
    <li><p>If the resource's URL is <span
    title="concept-appcache-implicit">an implicit entry</span>, <span
    title="concept-appcache-manifest">the manifest</span>, <span
    title="concept-appcache-explicit">an explicit entry</span>, <span
-   title="concept-appcache-fallback">a fallback entry</span>, <span
-   title="concept-appcache-oppcache">an opportunistically cached
-   entry</span>, or a <span title="concept-appcache-dynamic">dynamic
-   entry</span> in the <span>application cache</span>, then get the
-   resource from the cache (instead of fetching it), and abort these
-   steps.</p></li>
-
-   <li><p>If there is an entry in the <span>application cache</span>'s
-   <span title="concept-appcache-onlinewhitelist">online
-   whitelist</span> that has the <span>same origin</span> as the
-   resource's URL and that is a <span>prefix match</span> for the
-   resource's URL, then <span>fetch</span> the resource normally and
-   abort these steps.</p></li>
+   title="concept-appcache-fallback">a fallback entry</span>, or a
+   <span title="concept-appcache-dynamic">dynamic entry</span> in the
+   <span>application cache</span>, then get the resource from the
+   cache (instead of fetching it), and abort these steps.</p></li>
 
    <li>
 
     <p>If the resource's URL has the <span>same origin</span> as the
-    manifest's URL, and there is an <span
-    title="concept-appcache-oppcache-ns">opportunistic caching
-    namespace</span> in the <span>application cache</span> whose
-    &lt;path&gt; component is a <span>prefix match</span> for the
-    resource's URL's <span title="url-path">&lt;path&gt;</span>
-    component, then:
+    manifest's URL, and there is a <span
+    title="concept-appcache-fallback-ns">fallback namespace</span> in
+    the <span>application cache</span> whose &lt;path&gt; component is
+    a <span>prefix match</span> for the resource's URL's <span
+    title="url-path">&lt;path&gt;</span> component, then:</p>
 
     <p><span>Fetch</span> the resource normally. If this results 4xx
     or 5xx status codes or equivalent, or if there were network errors
     (but not if the user canceled the download), then instead get,
     from the cache, the resource of the <span
     title="concept-appcache-fallback">fallback entry</span>
-    corresponding to the namespace with the longest matching
-    &lt;path&gt; component. Abort these steps.</p>
+    corresponding to the namespace with the longest matching <span
+    title="url-path">&lt;path&gt;</span> component. Abort these
+    steps.</p>
 
    </li>
 
+   <li><p>If there is an entry in the <span>application cache</span>'s
+   <span title="concept-appcache-onlinewhitelist">online
+   whitelist</span> that has the <span>same origin</span> as the
+   resource's URL and that is a <span>prefix match</span> for the
+   resource's URL, then <span>fetch</span> the resource normally and
+   abort these steps.</p></li>
+
    <li><p>Fail the resource load.</p></li>
 
   </ol>
 
   <p class="note">The above algorithm ensures that resources that are
   not present in the manifest will always fail to load (at least,
   after the cache has been primed the first time), making the testing
   of offline applications simpler.</p>
 
 
@@ -40587,75 +40551,51 @@ user reload must be equivalent to .reload()
    <li><p>Wait for one or more bytes to be available or for the user
    agent to establish that the resource in question is empty. During
    this time, the user agent may allow the user to cancel this
    navigation attempt or start other navigation attempts.</p></li>
 
    <li>
 
     <p>If the resource was not fetched from an <span>application
     cache</span>, and was to be fetched using HTTP GET or equivalent,
     and its URL <span
-    title="concept-appcache-matches-oppcache">matches the
-    opportunistic caching namespace</span> of one or more application
-    caches, and the user didn't cancel the navigation attempt during
-    the previous step, then:</p>
-
-    <dl class="switch">
-
-     <dt>If the browsing context being navigated is a <span>top-level
-     browsing context</span>, and the navigation attempt failed
-     (e.g. the server returned a 4xx or 5xx status code or equivalent,
-     or there was a DNS error)</dt>
-
-     <dd>
-
-      <p>Let <var title="">candidate</var> be the <span
-      title="concept-appcache-fallback">fallback resource</span>
-      specified for the opportunistic caching namespace in
-      question. If multiple application caches match, the user agent
-      must use the fallback of the <span
-      title="concept-appcache-selection">most appropriate application
-      cache</span> of those that match.</p>
-
-      <p>If <var title="">candidate</var> is not marked as <span
-      title="concept-appcache-foreign">foreign</span>, then the user
-      agent must discard the failed load and instead continue along
-      these steps using <var title="">candidate</var> as the
-      resource.</p>
-
-      <p>For the purposes of session history (and features that depend
-      on session history, e.g. bookmarking) the user agent must use
-      the URL of the resource that was requested (the one that matched
-      the opportunistic caching namespace), not the fallback
-      resource. However, the user agent may indicate to the user that
-      the original page load failed, that the page used was a fallback
-      resource, and what the URL of the fallback resource actually
-      is.</p>
-
-     </dd>
-
-     <dt>Otherwise</dt>
-
-     <dd>
-
-      <p>Once the download is complete, if there were no errors and
-      the user didn't cancel the request, the user agent must cache
-      the resource in all the application caches that have a <span
-      title="concept-appcache-matches-oppcache">matching opportunistic
-      caching namespace</span>, categorized as <span
-      title="concept-appcache-oppcache">opportunistically cached
-      entries</span>. Meanwhile, the user agent must continue along
-      these steps.</p>
+    title="concept-appcache-matches-fallback">matches the fallback
+    namespace</span> of one or more application caches, and the user
+    didn't cancel the navigation attempt during the previous step, and
+    the browsing context being navigated is a <span>top-level browsing
+    context</span>, and the navigation attempt failed (e.g. the server
+    returned a 4xx or 5xx status code or equivalent, or there was a
+    DNS error), then:</p>
+
+    <p>Let <var title="">candidate</var> be the <span
+    title="concept-appcache-fallback">fallback resource</span>
+    specified for the <span
+    title="concept-appcache-fallback-ns">fallback namespace</span> in
+    question. If multiple application caches match, the user agent
+    must use the fallback of the <span
+    title="concept-appcache-selection">most appropriate application
+    cache</span> of those that match.</p>
 
-     </dd>
+    <p>If <var title="">candidate</var> is not marked as <span
+    title="concept-appcache-foreign">foreign</span>, then the user
+    agent must discard the failed load and instead continue along
+    these steps using <var title="">candidate</var> as the
+    resource.</p>
 
-    </dl>
+    <p>For the purposes of session history (and features that depend
+    on session history, e.g. bookmarking) the user agent must use the
+    URL of the resource that was requested (the one that matched the
+    <span title="concept-appcache-fallback-ns">fallback
+    namespace</span>), not the fallback resource. However, the user
+    agent may indicate to the user that the original page load failed,
+    that the page used was a fallback resource, and what the URL of
+    the fallback resource actually is.</p>
 
    </li>
 
    <li><p>If the document's out-of-band metadata (e.g. HTTP headers),
    not counting any <span title="Content-Type">type information</span>
    (such as the Content-Type HTTP header), requires some sort of
    processing that will not affect the browsing context, then perform
    that processing and abort these steps.</p>
 
    <div class="note">
@@ -46814,22 +46754,22 @@ XXX Once we resolve the style="" issue, address these:
   multiple times. If the URL fails to resolve, then the user agent
   must raise a <code>SYNTAX_ERR</code> exception.</p>
 
   <p>When the <dfn
   title="dom-RemoteEventTarget-removeEventSource"><code>removeEventSource(<var
   title="">src</var>)</code></dfn> method is invoked, the user agent
   must <span title="resolve a url">resolve</span> the <span>URL</span>
   specified in <var title="">src</var>, and if that succeeds, remove
   the resulting <span>absolute URL</span> from the <span
   title="concept-eventsource-list">list of event sources</span> for
-  that object.  If the same URI has been registered multiple times,
-  removing it must remove only one instance of that URI for each
+  that object.  If the same URL has been registered multiple times,
+  removing it must remove only one instance of that URL for each
   invocation of the <code
   title="removeEventSource">removeEventSource()</code> method. If the
   URL fails to resolve, the user agent does nothing.</p>
 
 
   <h4>Connecting to an event stream</h4>
 
   <p>Each object implementing the <code>EventTarget</code> and
   <code>RemoteEventTarget</code> interfaces has a <dfn
   title="concept-eventsource-list">list of event sources</dfn> that

|