Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[e] (0) Appcache: Rename 'implicit entries' to 'master entries'.
git-svn-id: http://svn.whatwg.org/webapps@2345 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Oct 16, 2008
1 parent 2f54561 commit bccb06c
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 68 deletions.
67 changes: 33 additions & 34 deletions index
Expand Up @@ -33854,19 +33854,19 @@ JSURL: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t
such as HTTP headers, if any), identified by URLs, each falling
into one (or more) of the following categories:</p>

<dl><dt><dfn id=concept-appcache-implicit title=concept-appcache-implicit>Implicit entries</dfn>
<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=#top-level-browsing-context>top-level browsing context</a> was <a href=#navigate title=navigate>navigated</a> to that document and the
<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.


<dt><dfn id=concept-appcache-manifest title=concept-appcache-manifest>The manifest</dfn>

<dd>The resource corresponding to the URL that was given in an
implicit entry's <code><a href=#the-html-element>html</a></code> element's <code title=attr-html-manifest><a href=#attr-html-manifest>manifest</a></code> attribute. The
master entry's <code><a href=#the-html-element>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-update-process>application
cache update process</a>. All the <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entries</a> have
cache update 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.


Expand Down Expand Up @@ -34408,8 +34408,8 @@ style/default.css</pre>
interface indicating to the user that the application is up to
date.</li>

<li><p>If there are any pending downloads of <span title="implicit entry">implicit entries</span> that are being
stored in the cache, then wait for all of them to have
<li><p>If there are any pending downloads of <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> that are
being stored in the cache, then wait for all of them to have
completed. If any of these downloads fail (e.g. the server
returns a 4xx or 5xx response or equivalent, or there is a DNS
error, or the connection times out, or the user cancels the
Expand Down Expand Up @@ -34454,8 +34454,8 @@ style/default.css</pre>
list</var>, each flagged with "fallback entry".</li>

<li><p>If this is an <a href=#concept-appcache-upgrade title=concept-appcache-upgrade>upgrade
attempt</a>, then add all the URLs of <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entries</a> in <var title="">cache</var> to <var title="">file list</var>, each flagged
with "implicit entry".</li>
attempt</a>, then add all the URLs of <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> in <var title="">cache</var> to <var title="">file list</var>, each flagged
with "master entry".</li>

<li><p>If this is an <a href=#concept-appcache-upgrade title=concept-appcache-upgrade>upgrade
attempt</a>, then add all the URLs of <a href=#concept-appcache-dynamic title=concept-appcache-dynamic>dynamic entries</a> in <var title="">cache</var> to <var title="">file list</var>, each flagged
Expand Down Expand Up @@ -34535,9 +34535,9 @@ style/default.css</pre>
entry as a <a href=#concept-appcache-fallback title=concept-appcache-fallback>fallback
entry</a>.</li>

<li><p>If the URL being processed was flagged as an "implicit
<li><p>If the URL being processed was flagged as an "master
entry" in <var title="">file list</var>, then categorize the
entry as a <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit
entry as a <a href=#concept-appcache-master title=concept-appcache-master>master
entry</a>.</li>

<li><p>If the URL being processed was flagged as an "dynamic
Expand Down Expand Up @@ -34566,9 +34566,8 @@ style/default.css</pre>

<li>

<p>Wait for all pending downloads of <span title="implicit
entry">implicit entries</span> that are being stored in the cache
to have completed.</p>
<p>Wait for all pending downloads of <a href=#concept-appcache-master title=concept-appcache-master>master entries</a> that are
being stored in the cache to have completed.</p>

<p class=example>For example, if the <a href=#browsing-context>browsing
context</a>'s <a href=#active-document>active document</a> isn't itself listed
Expand Down Expand Up @@ -34740,7 +34739,7 @@ style/default.css</pre>
of that <a href=#application-cache>application cache</a> contains a resource with
the URL of the manifest, and that resource is categorized as a
<a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a>, then:
store the resource in the matching cache, categorized as an <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entry</a>,
store the resource in the matching cache, categorized as an <a href=#concept-appcache-master title=concept-appcache-master>master entry</a>,
associate the <code>Document</code> with that cache, invoke the
<a href=#application-cache-update-process>application cache update process</a>, and abort these
steps.</li>
Expand All @@ -34756,7 +34755,7 @@ style/default.css</pre>
of that <a href=#application-cache>application cache</a> does not yet contain a
resource with the URL of the manifest, or it does but that
resource is not yet categorized as a <a href=#concept-appcache-manifest title=concept-appcache-manifest>manifest</a>: store the
resource in that cache, categorized as an <a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entry</a>
resource in that cache, categorized as an <a href=#concept-appcache-master title=concept-appcache-master>master entry</a>
(replacing the file's previous contents if it was already in the
cache, but not removing any other categories it might have), and
abort these steps. (An <a href=#application-cache-update-process>application cache update
Expand All @@ -34765,7 +34764,7 @@ style/default.css</pre>
<li><p>Otherwise, there is no matching <a href=#application-cache>application
cache</a>: create a new application cache identified by this
manifest URL, store the resource in that cache, categorized as an
<a href=#concept-appcache-implicit title=concept-appcache-implicit>implicit entry</a>,
<a href=#concept-appcache-master title=concept-appcache-master>master entry</a>,
and then invoke the <a href=#application-cache-update-process>application cache update
process</a>.</li>

Expand Down Expand Up @@ -34827,7 +34826,7 @@ style/default.css</pre>
mechanism or equivalent, then <a href=#fetch>fetch</a> the resource
normally and abort these steps.</li>

<li><p>If the resource's URL is <a href=#concept-appcache-implicit title=concept-appcache-implicit>an implicit entry</a>, <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>, <a href=#concept-appcache-explicit title=concept-appcache-explicit>an explicit entry</a>, <a href=#concept-appcache-fallback title=concept-appcache-fallback>a fallback entry</a>, or a
<li><p>If the resource's URL is <a href=#concept-appcache-master title=concept-appcache-master>an master entry</a>, <a href=#concept-appcache-manifest title=concept-appcache-manifest>the manifest</a>, <a href=#concept-appcache-explicit title=concept-appcache-explicit>an explicit entry</a>, <a href=#concept-appcache-fallback title=concept-appcache-fallback>a fallback entry</a>, or a
<a href=#concept-appcache-dynamic title=concept-appcache-dynamic>dynamic entry</a> in the
<a href=#application-cache>application cache</a>, then get the resource from the
cache (instead of fetching it), and abort these steps.</li>
Expand Down Expand Up @@ -52719,23 +52718,23 @@ interface <dfn id=timeouthandler>TimeoutHandler</dfn> {
Mathieu Henri, Matthew Mastracci, Matthew Raymond, Matthew Thomas,
Mattias Waldau, Max Romantschuk, Michael 'Ratt' Iannarelli, Michael
A. Nachbaur, Michael A. Puls II<!--Shadow2531-->, Michael Carter,
Michael Gratton, Michael Powers, Michael(tm) Smith, Michel Fortin,
Michiel van der Blonk, Mihai &#350;ucan<!-- from ROBO Design -->,
Mike Brown, Mike Dierken<!-- S. Mike Dierken -->, Mike Dixon, Mike
Schinkel, Mike Shaver, Mikko Rantalainen, Neil Deakin, Neil Soiffer,
Olaf Hoffmann, Olav Junker Kj&aelig;r, Oliver Hunt, Peter Karlsson,
Peter Kasting, Philip J&auml;genstedt, Philip Taylor, Philip
TAYLOR<!-- a different one -->, Rachid Finge, Rajas Moonka, Ralf
Stoltze, Ralph Giles, Raphael Champeimont, Rene Saarsoo, Richard
Ishida, Rimantas Liubertas, Robert Blaut, Robert O'Callahan, Robert
Sayre, Roman Ivanov, Ryan King, S. Mike Dierken, Sam Ruby, Sam
Weinig, Scott Hess, Sean Knapp, Shaun Inman, Silvia Pfeiffer, Simon
Pieters, Stefan Haustein, Steffen Meschkat, Stephen Ma, Steve
Faulkner, Steve Runyon, Steven Garrity, Stewart Brodie, Stuart
Parmenter, Sunava Dutta, Tantek &Ccedil;elik, Terrence Wood, Thomas
Broyer, Thomas O'Connor, Tim Altman, Tim Johansson, Travis Leithead,
Tyler Close, Vladimir Vuki&#263;evi&#263;, Wakaba, Wayne
Pollock, William Swanson, Yi-An Huang, and &Oslash;istein
Michael Gratton, Michael Nordman, Michael Powers, Michael(tm) Smith,
Michel Fortin, Michiel van der Blonk, Mihai &#350;ucan<!-- from
ROBO Design -->, Mike Brown, Mike Dierken<!-- S. Mike Dierken -->,
Mike Dixon, Mike Schinkel, Mike Shaver, Mikko Rantalainen, Neil
Deakin, Neil Soiffer, Olaf Hoffmann, Olav Junker Kj&aelig;r, Oliver
Hunt, Peter Karlsson, Peter Kasting, Philip J&auml;genstedt, Philip
Taylor, Philip TAYLOR<!-- a different one -->, Rachid Finge, Rajas
Moonka, Ralf Stoltze, Ralph Giles, Raphael Champeimont, Rene
Saarsoo, Richard Ishida, Rimantas Liubertas, Robert Blaut, Robert
O'Callahan, Robert Sayre, Roman Ivanov, Ryan King, S. Mike Dierken,
Sam Ruby, Sam Weinig, Scott Hess, Sean Knapp, Shaun Inman, Silvia
Pfeiffer, Simon Pieters, Stefan Haustein, Steffen Meschkat, Stephen
Ma, Steve Faulkner, Steve Runyon, Steven Garrity, Stewart Brodie,
Stuart Parmenter, Sunava Dutta, Tantek &Ccedil;elik, Terrence Wood,
Thomas Broyer, Thomas O'Connor, Tim Altman, Tim Johansson, Travis
Leithead, Tyler Close, Vladimir Vuki&#263;evi&#263;, Wakaba,
Wayne Pollock, William Swanson, Yi-An Huang, and &Oslash;istein
E. Andersen, for their useful and substantial comments.</p>

<p>Thanks also to everyone who has ever posted about HTML5 to their
Expand Down
68 changes: 34 additions & 34 deletions source
Expand Up @@ -38416,10 +38416,10 @@ JSURL: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t

<dl>

<dt><dfn title="concept-appcache-implicit">Implicit entries</dfn>
<dt><dfn title="concept-appcache-master">Master entries</dfn>

<dd>Documents that were added to the cache because a
<span>top-level browsing context</span> was <span
<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.
Expand All @@ -38428,11 +38428,11 @@ JSURL: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t
<dt><dfn title="concept-appcache-manifest">The manifest</dfn>

<dd>The resource corresponding to the URL that was given in an
implicit entry's <code>html</code> element's <code
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 update process</span>. All the <span
title="concept-appcache-implicit">implicit entries</span> have
title="concept-appcache-master">master entries</span> have
the <span title="same origin">same origin</span> as the manifest.


Expand Down Expand Up @@ -39065,8 +39065,8 @@ style/default.css</pre>
date.</p></li>

<li><p>If there are any pending downloads of <span
title="implicit entry">implicit entries</span> that are being
stored in the cache, then wait for all of them to have
title="concept-appcache-master">master entries</span> that are
being stored in the cache, then wait for all of them to have
completed. If any of these downloads fail (e.g. the server
returns a 4xx or 5xx response or equivalent, or there is a DNS
error, or the connection times out, or the user cancels the
Expand Down Expand Up @@ -39120,9 +39120,9 @@ style/default.css</pre>

<li><p>If this is an <span title="concept-appcache-upgrade">upgrade
attempt</span>, then add all the URLs of <span
title="concept-appcache-implicit">implicit entries</span> in <var
title="concept-appcache-master">master entries</span> in <var
title="">cache</var> to <var title="">file list</var>, each flagged
with "implicit entry".</p></li>
with "master entry".</p></li>

<li><p>If this is an <span title="concept-appcache-upgrade">upgrade
attempt</span>, then add all the URLs of <span
Expand Down Expand Up @@ -39208,9 +39208,9 @@ style/default.css</pre>
entry as a <span title="concept-appcache-fallback">fallback
entry</span>.</p></li>

<li><p>If the URL being processed was flagged as an "implicit
<li><p>If the URL being processed was flagged as an "master
entry" in <var title="">file list</var>, then categorize the
entry as a <span title="concept-appcache-implicit">implicit
entry as a <span title="concept-appcache-master">master
entry</span>.</p></li>

<li><p>If the URL being processed was flagged as an "dynamic
Expand Down Expand Up @@ -39246,9 +39246,9 @@ style/default.css</pre>

<li>

<p>Wait for all pending downloads of <span title="implicit
entry">implicit entries</span> that are being stored in the cache
to have completed.</p>
<p>Wait for all pending downloads of <span
title="concept-appcache-master">master entries</span> that are
being stored in the cache to have completed.</p>

<p class="example">For example, if the <span>browsing
context</span>'s <span>active document</span> isn't itself listed
Expand Down Expand Up @@ -39449,7 +39449,7 @@ style/default.css</pre>
the URL of the manifest, and that resource is categorized as a
<span title="concept-appcache-manifest">manifest</span>, then:
store the resource in the matching cache, categorized as an <span
title="concept-appcache-implicit">implicit entry</span>,
title="concept-appcache-master">master entry</span>,
associate the <code>Document</code> with that cache, invoke the
<span>application cache update process</span>, and abort these
steps.</p></li>
Expand All @@ -39468,7 +39468,7 @@ style/default.css</pre>
resource is not yet categorized as a <span
title="concept-appcache-manifest">manifest</span>: store the
resource in that cache, categorized as an <span
title="concept-appcache-implicit">implicit entry</span>
title="concept-appcache-master">master entry</span>
(replacing the file's previous contents if it was already in the
cache, but not removing any other categories it might have), and
abort these steps. (An <span>application cache update
Expand All @@ -39477,7 +39477,7 @@ style/default.css</pre>
<li><p>Otherwise, there is no matching <span>application
cache</span>: create a new application cache identified by this
manifest URL, store the resource in that cache, categorized as an
<span title="concept-appcache-implicit">implicit entry</span>,
<span title="concept-appcache-master">master entry</span>,
and then invoke the <span>application cache update
process</span>.</p></li>

Expand Down Expand Up @@ -39554,7 +39554,7 @@ style/default.css</pre>
normally and abort these steps.</p></li>

<li><p>If the resource's URL is <span
title="concept-appcache-implicit">an implicit entry</span>, <span
title="concept-appcache-master">an master entry</span>, <span
title="concept-appcache-manifest">the manifest</span>, <span
title="concept-appcache-explicit">an explicit entry</span>, <span
title="concept-appcache-fallback">a fallback entry</span>, or a
Expand Down Expand Up @@ -57415,23 +57415,23 @@ interface <dfn>TimeoutHandler</dfn> {
Mathieu Henri, Matthew Mastracci, Matthew Raymond, Matthew Thomas,
Mattias Waldau, Max Romantschuk, Michael 'Ratt' Iannarelli, Michael
A. Nachbaur, Michael A. Puls II<!--Shadow2531-->, Michael Carter,
Michael Gratton, Michael Powers, Michael(tm) Smith, Michel Fortin,
Michiel van der Blonk, Mihai &#x015E;ucan<!-- from ROBO Design -->,
Mike Brown, Mike Dierken<!-- S. Mike Dierken -->, Mike Dixon, Mike
Schinkel, Mike Shaver, Mikko Rantalainen, Neil Deakin, Neil Soiffer,
Olaf Hoffmann, Olav Junker Kj&aelig;r, Oliver Hunt, Peter Karlsson,
Peter Kasting, Philip J&auml;genstedt, Philip Taylor, Philip
TAYLOR<!-- a different one -->, Rachid Finge, Rajas Moonka, Ralf
Stoltze, Ralph Giles, Raphael Champeimont, Rene Saarsoo, Richard
Ishida, Rimantas Liubertas, Robert Blaut, Robert O'Callahan, Robert
Sayre, Roman Ivanov, Ryan King, S. Mike Dierken, Sam Ruby, Sam
Weinig, Scott Hess, Sean Knapp, Shaun Inman, Silvia Pfeiffer, Simon
Pieters, Stefan Haustein, Steffen Meschkat, Stephen Ma, Steve
Faulkner, Steve Runyon, Steven Garrity, Stewart Brodie, Stuart
Parmenter, Sunava Dutta, Tantek &Ccedil;elik, Terrence Wood, Thomas
Broyer, Thomas O'Connor, Tim Altman, Tim Johansson, Travis Leithead,
Tyler Close, Vladimir Vuki&#x0107;evi&#x0107;, Wakaba, Wayne
Pollock, William Swanson, Yi-An Huang, and &Oslash;istein
Michael Gratton, Michael Nordman, Michael Powers, Michael(tm) Smith,
Michel Fortin, Michiel van der Blonk, Mihai &#x015E;ucan<!-- from
ROBO Design -->, Mike Brown, Mike Dierken<!-- S. Mike Dierken -->,
Mike Dixon, Mike Schinkel, Mike Shaver, Mikko Rantalainen, Neil
Deakin, Neil Soiffer, Olaf Hoffmann, Olav Junker Kj&aelig;r, Oliver
Hunt, Peter Karlsson, Peter Kasting, Philip J&auml;genstedt, Philip
Taylor, Philip TAYLOR<!-- a different one -->, Rachid Finge, Rajas
Moonka, Ralf Stoltze, Ralph Giles, Raphael Champeimont, Rene
Saarsoo, Richard Ishida, Rimantas Liubertas, Robert Blaut, Robert
O'Callahan, Robert Sayre, Roman Ivanov, Ryan King, S. Mike Dierken,
Sam Ruby, Sam Weinig, Scott Hess, Sean Knapp, Shaun Inman, Silvia
Pfeiffer, Simon Pieters, Stefan Haustein, Steffen Meschkat, Stephen
Ma, Steve Faulkner, Steve Runyon, Steven Garrity, Stewart Brodie,
Stuart Parmenter, Sunava Dutta, Tantek &Ccedil;elik, Terrence Wood,
Thomas Broyer, Thomas O'Connor, Tim Altman, Tim Johansson, Travis
Leithead, Tyler Close, Vladimir Vuki&#x0107;evi&#x0107;, Wakaba,
Wayne Pollock, William Swanson, Yi-An Huang, and &Oslash;istein
E. Andersen, for their useful and substantial comments.</p>

<p>Thanks also to everyone who has ever posted about HTML5 to their
Expand Down

0 comments on commit bccb06c

Please sign in to comment.