--- a/discovery-api/WD-20130924.html Mon Sep 23 15:45:14 2013 +1000
+++ b/discovery-api/WD-20130924.html Mon Sep 23 15:46:41 2013 +1000
@@ -661,7 +661,7 @@
<a class="externalDFN" href="http://dom.spec.whatwg.org/#promises">Promise</a> <a href="#dom-navigator-getnetworkservices">getNetworkServices</a>( in any type );
};
-<a class="externalDFN" href="http://www.whatwg.org/specs/web-apps/current-work/complete/timers.html#navigator">Navigator</a> implements <a href="#navigatornetworkservice">NavigatorNetworkService</a>;
+<a class="externalDFN" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#navigator">Navigator</a> implements <a href="#navigatornetworkservice">NavigatorNetworkService</a>;
</pre>
<section id="methods">
<h3 aria-level="2" role="heading" id="h3_methods"><span class="secno">5.1 </span>
@@ -669,7 +669,7 @@
</h3>
<dl class="domintro">
<dt>
- <var title="">promise</var> = <var title="">window</var> . <code title="dom-navigator"><a href="http://www.whatwg.org/specs/web-apps/current-work/complete/timers.html#navigator">navigator</a></code> .
+ <var title="">promise</var> = <var title="">window</var> . <code title="dom-navigator"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#navigator">navigator</a></code> .
<code title="dom-navigator-getNetworkServices"><a href="#dom-navigator-getnetworkservices">getNetworkServices</a></code> ( <var title="">type</var> )
</dt>
<dd>
@@ -753,7 +753,7 @@
<li>The user agent <em class="rfc2119" title="MUST NOT">MUST NOT</em> provide the entry script's origin with a <a href="#networkservices"><code>NetworkServices</code></a> object without prior permission given by the user.
<p>
If <var>services found</var> is not an empty array then the <a href="#dfn-user-agent" class="internalDFN">user agent</a> <em class="rfc2119" title="MAY">MAY</em> choose to prompt the
- user in a user-agent-specific manner for permission to provide the <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/origin-0.html#origin" class="externalDFN">origin</a> with a <a href="#networkservices"><code>NetworkServices</code></a>
+ user in a user-agent-specific manner for permission to provide the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin" class="externalDFN">origin</a> with a <a href="#networkservices"><code>NetworkServices</code></a>
object representing the <a href="#dfn-user-authorized" class="internalDFN">user-authorized</a> subset of <var>services found</var>.
</p>
<p>
@@ -787,7 +787,7 @@
permission above - known as the current objects <dfn id="dfn-user-authorized">user-authorized</dfn> services.
</li>
<li>Remove all previously whitelisted urls from the <a href="#dfn-entry-script-origin-s-url-whitelist" class="internalDFN">entry script origin's <abbr title="Uniform Resource Locator">URL</abbr> whitelist</a> granted in
- the current <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/origin-0.html#origin" class="externalDFN">origin</a>.
+ the current <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin" class="externalDFN">origin</a>.
</li>
<li>For each Object <var>service</var> in <var>services</var>, if any, run the following sub-steps:
<ol class="rule">
@@ -823,17 +823,17 @@
</li>
</ol>
<p>
- The <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#task-source" class="externalDFN">task source</a> for these <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#concept-task" class="externalDFN">tasks</a> is the <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#user-interaction-task-source" class="externalDFN">user interaction task source</a>.
+ The <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#task-source" class="externalDFN">task source</a> for these <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#concept-task" class="externalDFN">tasks</a> is the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#user-interaction-task-source" class="externalDFN">user interaction task source</a>.
</p>
<p>
When a <a href="#networkservice"><code>NetworkService</code></a> object is provided to a Web page, the
<a href="#dfn-user-agent" class="internalDFN">user agent</a> <em class="rfc2119" title="MUST">MUST</em> add its <a href="#dom-networkservice-url"><code>url</code></a> to the <dfn id="dfn-entry-script-origin-s-url-whitelist">entry
script origin's <abbr title="Uniform Resource Locator">URL</abbr> whitelist</dfn>. This list enables the Web page to override and initiate cross-site
- resource requests towards these URLs, and any sub-resources of these URLs, within the current <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/origin-0.html#origin" class="externalDFN">origin</a> via various existing mechanisms (e.g. Web Sockets, Server-Sent Events,
+ resource requests towards these URLs, and any sub-resources of these URLs, within the current <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin" class="externalDFN">origin</a> via various existing mechanisms (e.g. Web Sockets, Server-Sent Events,
Web Messaging, XMLHttpRequest).
</p>
<p>
- If the user navigates away from the <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/origin-0.html#origin" class="externalDFN">origin</a> or permission to access a given networked service is revoked at any time
+ If the user navigates away from the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#entry-script" class="externalDFN">entry script</a>'s <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin" class="externalDFN">origin</a> or permission to access a given networked service is revoked at any time
by the platform or user then the <a href="#dfn-user-agent" class="internalDFN">user agent</a> <em class="ct"><em class="rfc2119" title="MUST">MUST</em></em> remove its previously
whitelisted urls from the <a href="#dfn-entry-script-origin-s-url-whitelist" class="internalDFN">entry script origin's <abbr title="Uniform Resource Locator">URL</abbr> whitelist</a>.
</p>
@@ -1279,7 +1279,7 @@
<ol class="rule">
<li>If the <var>network service record</var>'s <code>id</code> property equals the <var>active
service</var>'s <code>id</code> attribute and <var>active service</var>'s <code>online</code> attribute
- is currently set to <code>false</code> then set <var>active service</var>'s <a href="#dom-networkservice-online"><code>online</code></a> attribute to <code>true</code> and then <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-available"><code>available</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable,
+ is currently set to <code>false</code> then set <var>active service</var>'s <a href="#dom-networkservice-online"><code>online</code></a> attribute to <code>true</code> and then <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-available"><code>available</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable,
and has no default action, at the current <var>active service</var> object.
</li>
</ol>
@@ -1300,7 +1300,7 @@
</li>
<li>If the <var>'service type in current service manager' flag</var> is set to <code>true</code> then
increment <var>service manager</var>'s <a href="#dom-networkservices-servicesavailable"><code>servicesAvailable</code></a> attribute by <code>1</code> and
- then <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-servicefound"><code>servicefound</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable, and
+ then <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-servicefound"><code>servicefound</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable, and
has no default action, at the current <var>service manager</var> object.
</li>
</ol>
@@ -1332,7 +1332,7 @@
<li>If <var>existing service record</var>'s <code>id</code> property equals the <var>active
service</var>'s <code>id</code> attribute and <var>active service</var>'s <a href="#dom-networkservice-online"><code>online</code></a> attribute is currently set to
<code>true</code> then set <var>active service</var>'s <a href="#dom-networkservice-online"><code>
- online</code></a> attribute to <code>false</code> and then <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-unavailable"><code>unavailable</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not
+ online</code></a> attribute to <code>false</code> and then <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-unavailable"><code>unavailable</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not
cancellable, and has no default action, at the current <var>active service</var>.
</li>
</ol>
@@ -1352,7 +1352,7 @@
</li>
<li>If the <var>'service type in current service manager' flag</var> is set to <code>true</code> then
decrement <var>service manager</var>'s <a href="#dom-networkservices-servicesavailable"><code>servicesAvailable</code></a> attribute by <code>1</code>
- and then <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-servicelost"><code>servicelost</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable,
+ and then <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" class="externalDFN">queue a task</a> to dispatch a newly created event with the name <a href="#event-servicelost"><code>servicelost</code></a> that uses the <a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#event" class="externalDFN"><code>Event</code></a> interface, which does not bubble, is not cancellable,
and has no default action, at the current <var>service manager</var> object.
</li>
</ol>
@@ -1681,7 +1681,7 @@
<var>content clone</var>.
</li>
<li>
- <a href="http://www.whatwg.org/specs/web-apps/current-work/complete/webappapis.html#queue-a-task" class="externalDFN">Queue a task</a> to dispatch <var>notification event</var> at the current
+ <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" class="externalDFN">Queue a task</a> to dispatch <var>notification event</var> at the current
<a href="#networkservice" class="internalDFN"><code>NetworkService</code></a> object.
</li>
<li>Return a <abbr title="Hypertext Transfer Protocol">HTTP</abbr> 200 OK response to the sender of the <abbr title="Hypertext Transfer Protocol">HTTP</abbr> NOTIFY request.