W3C home > Mailing lists > Public > public-html-commits@w3.org > October 2009

html5/spec Overview.html,1.3293,1.3294

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 16 Oct 2009 01:32:24 +0000
To: public-html-commits@w3.org
Message-Id: <E1Mybg8-0005Jt-8R@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv20428

Modified Files:
	Overview.html 
Log Message:
Make the NETWORK: section override the FALLBACK: section. Comment out a comment regarding <cite> not being applicable for ships. (whatwg r4145)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3293
retrieving revision 1.3294
diff -u -d -r1.3293 -r1.3294
--- Overview.html	15 Oct 2009 20:34:58 -0000	1.3293
+++ Overview.html	16 Oct 2009 01:32:20 -0000	1.3294
@@ -216,7 +216,7 @@
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
    <!--ZZZ:-->
    <!--<h2 class="no-num no-toc">W3C Working Draft 25 August 2009</h2>-->
-   <h2 class="no-num no-toc" id="editor-s-draft-15-october-2009">Editor's Draft 15 October 2009</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-16-october-2009">Editor's Draft 16 October 2009</h2>
    <!--:ZZZ-->
    <dl><!-- ZZZ: update the month/day (twice), (un)comment out--><!--
     <dt>This Version:</dt>
@@ -318,7 +318,7 @@
   track.
   <!--ZZZ:-->
   <!--This specification is the 25 August 2009 Working Draft.-->
-  This specification is the 15 October 2009 Editor's Draft.
+  This specification is the 16 October 2009 Editor's Draft.
   <!--:ZZZ-->
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>This specification is also being produced by the <a href="http://www.whatwg.org/">WHATWG</a>. The two specifications are
   identical from the table of contents onwards.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- context and rationale (required) --><p>This specification is intended to replace (be a new version of)
@@ -13906,9 +13906,11 @@
   gossip article where the names of famous people are keywords
   rendered with a different style to draw attention to them. In other
   cases, if an element is <em>really</em> needed, the
-  <code><a href="#the-span-element">span</a></code> element can be used.)<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
-  that purpose).<div class="example">
+  <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>i</code> element can be used for
+  that purpose).</p>
+--><div class="example">
 
    <p>This next example shows a typical use of the <code><a href="#the-cite-element">cite</a></code>
    element:</p>
@@ -45098,8 +45100,15 @@
 
    <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>
 
@@ -45916,6 +45925,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
@@ -45939,13 +45955,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
Received on Friday, 16 October 2009 01:32:28 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 16 October 2009 01:32:29 GMT