[e] (0) try to clarify what is normative and what is not in the defin…

…ition of the appcache stuff. Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11687 git-svn-id: http://svn.whatwg.org/webapps@5811 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 1, 2011 · 962e4d5 · 962e4d5
1 parent cc89679
commit 962e4d5
Show file tree

Hide file tree

Showing 3 changed files with 155 additions and 89 deletions.
diff --git a/complete.html b/complete.html
@@ -61807,30 +61807,33 @@ <h4 id=appcache><span class=secno>6.6.2 </span>Application caches</h4>
 
     <dl><dt><dfn id=concept-appcache-master title=concept-appcache-master>Master entries</dfn>
 
-     <dd>Documents that were added to the cache because a
-     <a href=#browsing-context>browsing context</a> was <a href=#navigate title=navigate>navigated</a> to that document and the
-     document indicated that this was its cache, using the <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute.
+     <dd><p class=note>These are documents that were added to the
+     cache because a <a href=#browsing-context>browsing context</a> was <a href=#navigate title=navigate>navigated</a> to that document and the
+     document indicated that this was its cache, using the <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute.</p>
 
 
      <dt><dfn id=concept-appcache-manifest title=concept-appcache-manifest>The manifest</dfn>
 
-     <dd>The resource corresponding to the URL that was given in a
-     master entry's <code><a href=#the-html-element-0>html</a></code> element's <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute. The
+     <dd><p class=note>This is the resource corresponding to the URL
+     that was given in a master entry's <code><a href=#the-html-element-0>html</a></code> element's
+     <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute. The
      manifest is fetched and processed during the <a href=#application-cache-download-process>application
-     cache download process</a>. All the <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> have
-     the <a href=#same-origin title="same origin">same origin</a> as the manifest.
+     cache download process</a>. All the <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> have the
+     <a href=#same-origin title="same origin">same origin</a> as the manifest.</p>
 
 
      <dt><dfn id=concept-appcache-explicit title=concept-appcache-explicit>Explicit entries</dfn>
 
-     <dd>Resources that were listed in the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in an <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
-     section</a>.
+     <dd><p class=note>These are the resources that were listed in
+     the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in an <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
+     section</a>.</p>
 
 
      <dt><dfn id=concept-appcache-fallback title=concept-appcache-fallback>Fallback entries</dfn>
 
-     <dd>Resources that were listed in the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in a <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback
-     section</a>.
+     <dd><p class=note>These are the resources that were listed in
+     the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in a <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback
+     section</a>.</p>
 
 
     </dl><p><a href=#concept-appcache-explicit title=concept-appcache-explicit>Explicit entries</a>
@@ -61847,23 +61850,42 @@ <h4 id=appcache><span class=secno>6.6.2 </span>Application caches</h4>
 
    </li>
 
-   <li>Zero or more <dfn id=concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
-   namespaces</dfn>: URLs, used as <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>prefix match
-   patterns</a>, each of which is mapped to a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>. Each
-   namespace URL has the <a href=#same-origin>same origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</li>
-
-   <li>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
-   namespaces</dfn>: URLs, used as prefix match patterns, that the
-   user agent will never load from the cache but will instead always
-   attempt to obtain from the network.</li>
-
-   <li>An <dfn id=concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
-   wildcard flag</dfn>, which is either <i title="">open</i>
-   (indicating that any URL not listed as cached is to be implicitly
-   treated as being in the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
-   namespaces</a>) or <i title="">blocking</i> (indicating that
-   URLs not listed explicitly in the manifest are to be treated as
-   unavailable).</li>
+   <li>
+
+    <p>Zero or more <dfn id=concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+    namespaces</dfn>, each of which is mapped to a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>.</p>
+
+    <p class=note>These are URLs used as <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>prefix match
+    patterns</a> for resources that are to be fetched from the
+    network if possible, or to be replaced by the corresponding <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a> if not.
+    Each namespace URL has the <a href=#same-origin>same origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</p>
+
+   </li>
+
+   <li>
+
+    <p>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
+    namespaces</dfn>.</p>
+
+    <p class=note>These are used as prefix match patterns, and
+    declare URLs that the user agent will never load from the cache
+    but will instead always attempt to obtain from the network.</p>
+
+   </li>
+
+   <li>
+
+    <p>An <dfn id=concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
+    wildcard flag</dfn>, which is either <i title="">open</i> or <i title="">blocking</i>.</p>
+
+    <p class=note>The <i title="">open</i> state indicates that any
+    URL not listed as cached is to be implicitly treated as being in
+    the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+    whitelist namespaces</a>; the <i title="">blocking</i> state
+    indicates that URLs not listed explicitly in the manifest are to
+    be treated as unavailable.</p>
+
+   </li>
 
   </ul><p>Each <a href=#application-cache>application cache</a> has a <dfn id=concept-appcache-completeness title=concept-appcache-completeness>completeness flag</dfn>, which is
   either <i>complete</i> or <i>incomplete</i>.</p>

diff --git a/index b/index
@@ -61792,30 +61792,33 @@ clock.js</pre>
 
     <dl><dt><dfn id=concept-appcache-master title=concept-appcache-master>Master entries</dfn>
 
-     <dd>Documents that were added to the cache because a
-     <a href=#browsing-context>browsing context</a> was <a href=#navigate title=navigate>navigated</a> to that document and the
-     document indicated that this was its cache, using the <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute.
+     <dd><p class=note>These are documents that were added to the
+     cache because a <a href=#browsing-context>browsing context</a> was <a href=#navigate title=navigate>navigated</a> to that document and the
+     document indicated that this was its cache, using the <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute.</p>
 
 
      <dt><dfn id=concept-appcache-manifest title=concept-appcache-manifest>The manifest</dfn>
 
-     <dd>The resource corresponding to the URL that was given in a
-     master entry's <code><a href=#the-html-element-0>html</a></code> element's <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute. The
+     <dd><p class=note>This is the resource corresponding to the URL
+     that was given in a master entry's <code><a href=#the-html-element-0>html</a></code> element's
+     <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute. The
      manifest is fetched and processed during the <a href=#application-cache-download-process>application
-     cache download process</a>. All the <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> have
-     the <a href=#same-origin title="same origin">same origin</a> as the manifest.
+     cache download process</a>. All the <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> have the
+     <a href=#same-origin title="same origin">same origin</a> as the manifest.</p>
 
 
      <dt><dfn id=concept-appcache-explicit title=concept-appcache-explicit>Explicit entries</dfn>
 
-     <dd>Resources that were listed in the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in an <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
-     section</a>.
+     <dd><p class=note>These are the resources that were listed in
+     the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in an <a href=#concept-appcache-manifest-explicit title=concept-appcache-manifest-explicit>explicit
+     section</a>.</p>
 
 
      <dt><dfn id=concept-appcache-fallback title=concept-appcache-fallback>Fallback entries</dfn>
 
-     <dd>Resources that were listed in the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in a <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback
-     section</a>.
+     <dd><p class=note>These are the resources that were listed in
+     the cache's <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a> in a <a href=#concept-appcache-manifest-fallback title=concept-appcache-manifest-fallback>fallback
+     section</a>.</p>
 
 
     </dl><p><a href=#concept-appcache-explicit title=concept-appcache-explicit>Explicit entries</a>
@@ -61832,23 +61835,42 @@ clock.js</pre>
 
    </li>
 
-   <li>Zero or more <dfn id=concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
-   namespaces</dfn>: URLs, used as <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>prefix match
-   patterns</a>, each of which is mapped to a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>. Each
-   namespace URL has the <a href=#same-origin>same origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</li>
-
-   <li>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
-   namespaces</dfn>: URLs, used as prefix match patterns, that the
-   user agent will never load from the cache but will instead always
-   attempt to obtain from the network.</li>
-
-   <li>An <dfn id=concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
-   wildcard flag</dfn>, which is either <i title="">open</i>
-   (indicating that any URL not listed as cached is to be implicitly
-   treated as being in the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
-   namespaces</a>) or <i title="">blocking</i> (indicating that
-   URLs not listed explicitly in the manifest are to be treated as
-   unavailable).</li>
+   <li>
+
+    <p>Zero or more <dfn id=concept-appcache-fallback-ns title=concept-appcache-fallback-ns>fallback
+    namespaces</dfn>, each of which is mapped to a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a>.</p>
+
+    <p class=note>These are URLs used as <a href=#concept-appcache-matches-fallback title=concept-appcache-matches-fallback>prefix match
+    patterns</a> for resources that are to be fetched from the
+    network if possible, or to be replaced by the corresponding <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback entry</a> if not.
+    Each namespace URL has the <a href=#same-origin>same origin</a> as <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>.</p>
+
+   </li>
+
+   <li>
+
+    <p>Zero or more URLs that form the <dfn id=concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online whitelist
+    namespaces</dfn>.</p>
+
+    <p class=note>These are used as prefix match patterns, and
+    declare URLs that the user agent will never load from the cache
+    but will instead always attempt to obtain from the network.</p>
+
+   </li>
+
+   <li>
+
+    <p>An <dfn id=concept-appcache-onlinewhitelist-wildcard title=concept-appcache-onlinewhitelist-wildcard>online whitelist
+    wildcard flag</dfn>, which is either <i title="">open</i> or <i title="">blocking</i>.</p>
+
+    <p class=note>The <i title="">open</i> state indicates that any
+    URL not listed as cached is to be implicitly treated as being in
+    the <a href=#concept-appcache-onlinewhitelist title=concept-appcache-onlinewhitelist>online
+    whitelist namespaces</a>; the <i title="">blocking</i> state
+    indicates that URLs not listed explicitly in the manifest are to
+    be treated as unavailable.</p>
+
+   </li>
 
   </ul><p>Each <a href=#application-cache>application cache</a> has a <dfn id=concept-appcache-completeness title=concept-appcache-completeness>completeness flag</dfn>, which is
   either <i>complete</i> or <i>incomplete</i>.</p>

diff --git a/source b/source
@@ -70236,38 +70236,40 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
 
      <dt><dfn title="concept-appcache-master">Master entries</dfn>
 
-     <dd>Documents that were added to the cache because a
-     <span>browsing context</span> was <span
+     <dd><p class="note">These are documents that were added to the
+     cache because a <span>browsing context</span> was <span
      title="navigate">navigated</span> to that document and the
      document indicated that this was its cache, using the <code
-     title="attr-html-manifest">manifest</code> attribute.
+     title="attr-html-manifest">manifest</code> attribute.</p>
 
 
      <dt><dfn title="concept-appcache-manifest">The manifest</dfn>
 
-     <dd>The resource corresponding to the URL that was given in a
-     master entry's <code>html</code> element's <code
-     title="attr-html-manifest">manifest</code> attribute. The
+     <dd><p class="note">This is the resource corresponding to the URL
+     that was given in a master entry's <code>html</code> element's
+     <code title="attr-html-manifest">manifest</code> attribute. The
      manifest is fetched and processed during the <span>application
      cache download process</span>. All the <span
-     title="concept-appcache-master">master entries</span> have
-     the <span title="same origin">same origin</span> as the manifest.
+     title="concept-appcache-master">master entries</span> have the
+     <span title="same origin">same origin</span> as the manifest.</p>
 
 
      <dt><dfn title="concept-appcache-explicit">Explicit entries</dfn>
 
-     <dd>Resources that were listed in the cache's <span
+     <dd><p class="note">These are the resources that were listed in
+     the cache's <span
      title="concept-appcache-manifest">manifest</span> in an <span
      title="concept-appcache-manifest-explicit">explicit
-     section</span>.
+     section</span>.</p>
 
 
      <dt><dfn title="concept-appcache-fallback">Fallback entries</dfn>
 
-     <dd>Resources that were listed in the cache's <span
+     <dd><p class="note">These are the resources that were listed in
+     the cache's <span
      title="concept-appcache-manifest">manifest</span> in a <span
      title="concept-appcache-manifest-fallback">fallback
-     section</span>.
+     section</span>.</p>
 
 
     </dl>
@@ -70288,29 +70290,49 @@ State: &lt;OUTPUT NAME=I>1&lt;/OUTPUT> &lt;INPUT VALUE="Increment" TYPE=BUTTON O
 
    </li>
 
-   <li>Zero or more <dfn title="concept-appcache-fallback-ns">fallback
-   namespaces</dfn>: URLs, used as <span
-   title="concept-appcache-matches-fallback">prefix match
-   patterns</span>, each of which is mapped to a <span
-   title="concept-appcache-fallback">fallback entry</span>. Each
-   namespace URL has the <span>same origin</span> as <span
-   title="concept-appcache-manifest">the manifest</span>.</li>
+   <li>
 
-   <li>Zero or more URLs that form the <dfn
-   title="concept-appcache-onlinewhitelist">online whitelist
-   namespaces</dfn>: URLs, used as prefix match patterns, that the
-   user agent will never load from the cache but will instead always
-   attempt to obtain from the network.</li>
+    <p>Zero or more <dfn title="concept-appcache-fallback-ns">fallback
+    namespaces</dfn>, each of which is mapped to a <span
+    title="concept-appcache-fallback">fallback entry</span>.</p>
 
-   <li>An <dfn
-   title="concept-appcache-onlinewhitelist-wildcard">online whitelist
-   wildcard flag</dfn>, which is either <i title="">open</i>
-   (indicating that any URL not listed as cached is to be implicitly
-   treated as being in the <span
-   title="concept-appcache-onlinewhitelist">online whitelist
-   namespaces</span>) or <i title="">blocking</i> (indicating that
-   URLs not listed explicitly in the manifest are to be treated as
-   unavailable).</li>
+    <p class="note">These are URLs used as <span
+    title="concept-appcache-matches-fallback">prefix match
+    patterns</span> for resources that are to be fetched from the
+    network if possible, or to be replaced by the corresponding <span
+    title="concept-appcache-fallback">fallback entry</span> if not.
+    Each namespace URL has the <span>same origin</span> as <span
+    title="concept-appcache-manifest">the manifest</span>.</p>
+
+   </li>
+
+   <li>
+
+    <p>Zero or more URLs that form the <dfn
+    title="concept-appcache-onlinewhitelist">online whitelist
+    namespaces</dfn>.</p>
+
+    <p class="note">These are used as prefix match patterns, and
+    declare URLs that the user agent will never load from the cache
+    but will instead always attempt to obtain from the network.</p>
+
+   </li>
+
+   <li>
+
+    <p>An <dfn
+    title="concept-appcache-onlinewhitelist-wildcard">online whitelist
+    wildcard flag</dfn>, which is either <i title="">open</i> or <i
+    title="">blocking</i>.</p>
+
+    <p class="note">The <i title="">open</i> state indicates that any
+    URL not listed as cached is to be implicitly treated as being in
+    the <span title="concept-appcache-onlinewhitelist">online
+    whitelist namespaces</span>; the <i title="">blocking</i> state
+    indicates that URLs not listed explicitly in the manifest are to
+    be treated as unavailable.</p>
+
+   </li>
 
   </ul>