html5/spec Overview.html,1.3196,1.3197

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv6787

Modified Files:
	Overview.html 
Log Message:
Try to make this note about what happens with clashes in the manifest cover more cases. (whatwg r4035)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3196
retrieving revision 1.3197
diff -u -d -r1.3196 -r1.3197
--- Overview.html	29 Sep 2009 07:55:01 -0000	1.3196
+++ Overview.html	29 Sep 2009 08:07:52 -0000	1.3197
@@ -47470,13 +47470,22 @@
    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>

Received on Tuesday, 29 September 2009 08:08:07 UTC