[html5] r4035 - [e] (0) Try to make this note about what happens with clashes in the manifest co [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2009-09-29 01:16:11 -0700 (Tue, 29 Sep 2009)
New Revision: 4035

Modified:
   index
   source
Log:
[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

Modified: index
===================================================================
--- index	2009-09-29 08:03:20 UTC (rev 4034)
+++ index	2009-09-29 08:16:11 UTC (rev 4035)
@@ -52690,15 +52690,24 @@
    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>
 
   <p>When the user agent is required (by other parts of this

Modified: source
===================================================================
--- source	2009-09-29 08:03:20 UTC (rev 4034)
+++ source	2009-09-29 08:16:11 UTC (rev 4035)
@@ -59564,18 +59564,29 @@
 
   </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>
 
   <p>When the user agent is required (by other parts of this