Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[e] (0) Try to make this note about what happens with clashes in the …
…manifest cover more cases.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=7690

git-svn-id: http://svn.whatwg.org/webapps@4035 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Sep 29, 2009
1 parent f15b504 commit 4af65fa
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 17 deletions.
23 changes: 16 additions & 7 deletions index
Expand Up @@ -52690,13 +52690,22 @@ NETWORK:
whitelist URLs</var>, and the <var title="">online whitelist
wildcard flag</var>.</li>

</ol><p class=note>If a resource is listed in the <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit section</a>
and matches an entry in the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist</a>, or
if a resource matches both an entry in the <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback section</a>
and the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
whitelist</a>, the resource will taken from the cache, and the
<a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
whitelist</a> entry will be ignored.</p>
</ol><div class=note>

<p>If a resource is listed in the <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit section</a>
or as a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback
entry</a> in the <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback section</a>,
the resource will always be taken from the cache, regardless of any
other matching entries in the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespaces</a> or
<a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
namespaces</a>.</p>

<p>When a <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
namespace</a> and an <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
namespace</a> overlap, the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> has
priority.</p>

</div>


<h4 id=updating-an-application-cache><span class=secno>6.9.4 </span>Updating an application cache</h4>
Expand Down
31 changes: 21 additions & 10 deletions source
Expand Up @@ -59564,16 +59564,27 @@ NETWORK:

</ol>

<p class="note">If a resource is listed in the <span
title="concept-appcache-manifest-explicit">explicit section</span>
and matches an entry in the <span
title="concept-appcache-onlinewhitelist">online whitelist</span>, or
if a resource matches both an entry in the <span
title="concept-appcache-manifest-fallback">fallback section</span>
and the <span title="concept-appcache-onlinewhitelist">online
whitelist</span>, the resource will taken from the cache, and the
<span title="concept-appcache-onlinewhitelist">online
whitelist</span> entry will be ignored.</p>
<div class="note">

<p>If a resource is listed in the <span
title="concept-appcache-manifest-explicit">explicit section</span>
or as a <span title="concept-appcache-fallback">fallback
entry</span> in the <span
title="concept-appcache-manifest-fallback">fallback section</span>,
the resource will always be taken from the cache, regardless of any
other matching entries in the <span
title="concept-appcache-fallback-ns">fallback namespaces</span> or
<span title="concept-appcache-onlinewhitelist">online whitelist
namespaces</span>.</p>

<p>When a <span title="concept-appcache-fallback-ns">fallback
namespace</span> and an <span
title="concept-appcache-onlinewhitelist">online whitelist
namespace</span> overlap, the <span
title="concept-appcache-fallback-ns">fallback namespace</span> has
priority.</p>

</div>


<h4>Updating an application cache</h4>
Expand Down

0 comments on commit 4af65fa

Please sign in to comment.