[html5] r4145 - [agow] (1) Make the NETWORK: section override the FALLBACK: section. Comment out [...]
whatwg at whatwg.org
whatwg at whatwg.org
Thu Oct 15 18:44:04 PDT 2009
Author: ianh
Date: 2009-10-15 18:44:03 -0700 (Thu, 15 Oct 2009)
New Revision: 4145
Modified:
complete.html
index
source
Log:
[agow] (1) Make the NETWORK: section override the FALLBACK: section. Comment out a comment regarding <cite> not being applicable for ships.
Modified: complete.html
===================================================================
--- complete.html 2009-10-15 20:46:38 UTC (rev 4144)
+++ complete.html 2009-10-16 01:44:03 UTC (rev 4145)
@@ -110,7 +110,7 @@
<header class=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<hgroup><h1>Web Applications 1.0</h1>
- <h2 class="no-num no-toc">Draft Standard — 15 October 2009</h2>
+ <h2 class="no-num no-toc">Draft Standard — 16 October 2009</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -15956,9 +15956,11 @@
cases, if an element is <em>really</em> needed, the
<code><a href=#the-span-element>span</a></code> element can be used.)</p>
+<!--(some people argue a ship is a work)
<p>A ship is similarly not a work, and the element must not be used
- to mark up ship names (the <code><a href=#the-i-element>i</a></code> element can be used for
+ to mark up ship names (the <code>i</code> element can be used for
that purpose).</p>
+-->
<div class=example>
@@ -53150,9 +53152,16 @@
<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>
+ namespace</a> overlap, the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
+ namespace</a> has priority.</p>
+ <p>The <a href=#concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
+ wildcard flag</a> is applied last, only for URLs that match
+ neither the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+ whitelist namespace</a> nor the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> and
+ that are not listed in the <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
+ section</a>.</p>
+
</div>
@@ -53968,6 +53977,13 @@
the <a href=#application-cache>application cache</a>, then get the resource from the
cache (instead of fetching it), and abort these steps.</li>
+ <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
+ <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+ whitelist</a> that has the <a href=#same-origin>same origin</a> as the
+ resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
+ resource's URL, then <a href=#fetch>fetch</a> the resource normally and
+ abort these steps.</li>
+
<li>
<p>If the resource's URL has the <a href=#same-origin>same origin</a> as the
@@ -53991,13 +54007,6 @@
<a href=#fetch>fetch</a> the resource normally and abort these
steps.</li>
- <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
- <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
- whitelist</a> that has the <a href=#same-origin>same origin</a> as the
- resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
- resource's URL, then <a href=#fetch>fetch</a> the resource normally and
- abort these steps.</li>
-
<li><p>Fail the resource load.</li>
</ol><p class=note>The above algorithm ensures that so long as the
Modified: index
===================================================================
--- index 2009-10-15 20:46:38 UTC (rev 4144)
+++ index 2009-10-16 01:44:03 UTC (rev 4145)
@@ -111,7 +111,7 @@
<header class=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<hgroup><h1>HTML5</h1>
- <h2 class="no-num no-toc">Draft Standard — 15 October 2009</h2>
+ <h2 class="no-num no-toc">Draft Standard — 16 October 2009</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -15785,9 +15785,11 @@
cases, if an element is <em>really</em> needed, the
<code><a href=#the-span-element>span</a></code> element can be used.)</p>
+<!--(some people argue a ship is a work)
<p>A ship is similarly not a work, and the element must not be used
- to mark up ship names (the <code><a href=#the-i-element>i</a></code> element can be used for
+ to mark up ship names (the <code>i</code> element can be used for
that purpose).</p>
+-->
<div class=example>
@@ -50309,9 +50311,16 @@
<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>
+ namespace</a> overlap, the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
+ namespace</a> has priority.</p>
+ <p>The <a href=#concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
+ wildcard flag</a> is applied last, only for URLs that match
+ neither the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+ whitelist namespace</a> nor the <a href=#concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback namespace</a> and
+ that are not listed in the <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
+ section</a>.</p>
+
</div>
@@ -51127,6 +51136,13 @@
the <a href=#application-cache>application cache</a>, then get the resource from the
cache (instead of fetching it), and abort these steps.</li>
+ <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
+ <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+ whitelist</a> that has the <a href=#same-origin>same origin</a> as the
+ resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
+ resource's URL, then <a href=#fetch>fetch</a> the resource normally and
+ abort these steps.</li>
+
<li>
<p>If the resource's URL has the <a href=#same-origin>same origin</a> as the
@@ -51150,13 +51166,6 @@
<a href=#fetch>fetch</a> the resource normally and abort these
steps.</li>
- <li><p>If there is an entry in the <a href=#application-cache>application cache</a>'s
- <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
- whitelist</a> that has the <a href=#same-origin>same origin</a> as the
- resource's URL and that is a <a href=#prefix-match>prefix match</a> for the
- resource's URL, then <a href=#fetch>fetch</a> the resource normally and
- abort these steps.</li>
-
<li><p>Fail the resource load.</li>
</ol><p class=note>The above algorithm ensures that so long as the
Modified: source
===================================================================
--- source 2009-10-15 20:46:38 UTC (rev 4144)
+++ source 2009-10-16 01:44:03 UTC (rev 4145)
@@ -16844,9 +16844,11 @@
cases, if an element is <em>really</em> needed, the
<code>span</code> element can be used.)</p>
+<!--(some people argue a ship is a work)
<p>A ship is similarly not a work, and the element must not be used
to mark up ship names (the <code>i</code> element can be used for
that purpose).</p>
+-->
<div class="example">
@@ -59902,9 +59904,19 @@
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>
+ title="concept-appcache-onlinewhitelist">online whitelist
+ namespace</span> has priority.</p>
+ <p>The <span
+ title="concept-appcache-onlinewhitelist-wildcard">online whitelist
+ wildcard flag</span> is applied last, only for URLs that match
+ neither the <span title="concept-appcache-onlinewhitelist">online
+ whitelist namespace</span> nor the <span
+ title="concept-appcache-fallback-ns">fallback namespace</span> and
+ that are not listed in the <span
+ title="concept-appcache-manifest-explicit">explicit
+ section</span>.</p>
+
</div>
@@ -60876,6 +60888,13 @@
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>
+
<li>
<p>If the resource's URL has the <span>same origin</span> as the
@@ -60901,13 +60920,6 @@
<span>fetch</span> the resource normally 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>
-
<li><p>Fail the resource load.</p></li>
</ol>
More information about the Commit-Watchers
mailing list