--- a/discovery-api/Overview.html Thu Oct 10 12:36:37 2013 +1100
+++ b/discovery-api/Overview.html Mon Oct 28 11:31:42 2013 +1100
@@ -47,7 +47,7 @@
*****************************************************************/
/* --- INLINES --- */
- em.rfc2119 {
+ em.rfc2119 {
text-transform: lowercase;
font-variant: small-caps;
font-style: normal;
@@ -203,6 +203,13 @@
</style>
<link rel="stylesheet"
href="https://www.w3.org/StyleSheets/TR/W3C-ED">
+ <script type="text/javascript"
+ charset="utf-8"
+ async=""
+ data-requirecontext="_"
+ data-requiremodule="ui/save-html"
+ src="https://raw.github.com/darobin/respec/gh-pages/js/ui/save-html.js">
+</script>
</head>
<body class="h-entry"
style=""
@@ -224,10 +231,10 @@
</h1>
<h2 property="dcterms:issued"
datatype="xsd:dateTime"
- content="2013-10-09T14:32:43.000Z"
- id="w3c-editor-s-draft-10-october-2013">
+ content="2013-10-27T13:29:43.000Z"
+ id="w3c-editor-s-draft-28-october-2013">
<abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published"
- datetime="2013-10-10">10 October 2013</time>
+ datetime="2013-10-28">28 October 2013</time>
</h2>
<dl>
<dt>
@@ -282,8 +289,8 @@
property="dcterms:abstract"
datatype=""
typeof="bibo:Chapter"
- resource="#abstract"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h2 aria-level="1"
role="heading"
id="h2_abstract">
@@ -298,8 +305,8 @@
<section id="sotd"
class="introductory"
typeof="bibo:Chapter"
- resource="#sotd"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h2 aria-level="1"
role="heading"
id="h2_sotd">
@@ -664,8 +671,8 @@
</section>
<section id="conformance"
typeof="bibo:Chapter"
- resource="#conformance"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h2 aria-level="1"
role="heading"
id="h2_conformance">
@@ -1022,7 +1029,7 @@
<li>Let <var>requested control types</var> be initially set to an empty array.
</li>
<li>If <var>type</var> is an array consisting of one or more <a href="#dfn-valid-service-type"
- class="internalDFN">valid service type</a> tokens, then let <var>requested control types</var> by the
+ class="internalDFN">valid service type</a> tokens, then let <var>requested control types</var> be the
value of <var>type</var>, removing any non-<a href="#dfn-valid-service-type"
class="internalDFN">valid service type</a> tokens from the resulting array.
</li>
@@ -1174,7 +1181,7 @@
any of the tokens requested in <var>requested control types</var>.
</li>
<li>Add <var>services</var>, if any, to the <var>services manager</var> object as its collection of
- <a href="#dfn-indexed-properties-1"
+ <a href="#dfn-indexed-properties"
class="internalDFN">indexed properties</a>. If <var>services</var> is an empty array then the
<var>services manager</var> does not have any <var>indexed properties</var>.
</li>
@@ -1322,7 +1329,8 @@
</h2>
<p>
The <a href="#networkservices"><code>NetworkServices</code></a> interface represents a collection of zero or
- more <dfn id="dfn-indexed-properties">indexed properties</dfn> that are each a <a href="#dfn-user-authorized"
+ more <a href="#dfn-indexed-properties"
+ class="internalDFN">indexed properties</a> that are each a <a href="#dfn-user-authorized"
class="internalDFN">user-authorized</a> <a href="#networkservice"><code>NetworkService</code></a> object.
</p>
<p>
@@ -1365,7 +1373,7 @@
</dt>
<dd>
<p>
- Returns the current number of <a href="#dfn-indexed-properties-1"
+ Returns the current number of <a href="#dfn-indexed-properties"
class="internalDFN">indexed properties</a> in the current object's collection.
</p>
</dd>
@@ -1431,12 +1439,12 @@
<p>
A <a href="#networkservices"><code>NetworkServices</code></a> object represents the current collection of
zero or more <a href="#networkservice"><code>NetworkService</code></a> objects - its <a href=
- "#dfn-indexed-properties-1"
- class="internalDFN">indexed properties</a>. The <a href="#dfn-indexed-properties-1"
+ "#dfn-indexed-properties"
+ class="internalDFN">indexed properties</a>. The <a href="#dfn-indexed-properties"
class="internalDFN">indexed properties</a> of a <a href=
"#networkservices"><code>NetworkServices</code></a> object are <span>immutable</span> meaning that <a href=
- "#dfn-indexed-properties-1"
- class="internalDFN">indexed properties</a> cannot be added and <a href="#dfn-indexed-properties-1"
+ "#dfn-indexed-properties"
+ class="internalDFN">indexed properties</a> cannot be added and <a href="#dfn-indexed-properties"
class="internalDFN">indexed properties</a> cannot be removed for the lifetime of a <a href=
"#networkservices"><code>NetworkServices</code></a> object.
</p>
@@ -1783,9 +1791,8 @@
"#dfn-list-of-active-service-managers"
class="internalDFN">list of active service managers</a> represents a collection of zero or more <a href=
"#networkservice"><code>NetworkService</code></a> objects - known as its <dfn id=
- "dfn-indexed-properties-1">indexed properties</dfn>. <a href=
- "#networkservice"><code>NetworkService</code></a> objects are attached as the <a href=
- "#dfn-indexed-properties-1"
+ "dfn-indexed-properties">indexed properties</dfn>. <a href="#networkservice"><code>NetworkService</code></a>
+ objects are attached as the <a href="#dfn-indexed-properties"
class="internalDFN">indexed properties</a> of a <a href="#networkservices"><code>NetworkServices</code></a>
object as part of the <a href="#dom-navigator-getnetworkservices"><code>getNetworkServices()</code></a>
algorithm.
@@ -2432,25 +2439,29 @@
</p>
<p>
The user agent <em class="rfc2119"
- title="MUST">MUST</em> issue all <a title="search request for DIAL devices">search requests for
- <abbr title="Discovery and Launch Protocol">DIAL</abbr> devices</a> with a <abbr title=
- "Hypertext Transfer Protocol">HTTP</abbr> request line equal to <code>M-SEARCH * <abbr title=
- "Hypertext Transfer Protocol">HTTP</abbr>/1.1</code>, with a HOST header equal to the reserved multicast
- address and port of <code>239.255.255.250:1900</code>, a MAN header equal to <code>ssdp:discover</code>,
- an ST header equal to <var>dial search target</var> and a user-agent defined MX header equal to a <dfn id=
- "dfn-maximum-dial-advertisement-response-wait-time">maximum <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> advertisement response wait time</dfn> value between
- <code>1</code> and <code>5</code> seconds.
+ title="MUST">MUST</em> issue all <a title="search request for DIAL-enabled devices"
+ href="#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search requests for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> with a <abbr title="Hypertext Transfer Protocol">HTTP</abbr> request line equal to
+ <code>M-SEARCH * <abbr title="Hypertext Transfer Protocol">HTTP</abbr>/1.1</code>, with a HOST header
+ equal to the reserved multicast address and port of <code>239.255.255.250:1900</code>, a MAN header equal
+ to <code>ssdp:discover</code>, an ST header equal to <var>dial search target</var> and a user-agent
+ defined MX header equal to a <dfn id="dfn-maximum-dial-advertisement-response-wait-time">maximum
+ <abbr title="Discovery and Launch Protocol">DIAL</abbr> advertisement response wait time</dfn> value
+ between <code>1</code> and <code>5</code> seconds.
</p>
<p>
The user agent <em class="rfc2119"
- title="MUST">MUST</em> listen for any incoming responses to a <a>search request for <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> devices</a>.
+ title="MUST">MUST</em> listen for any incoming responses to a <a href=
+ "#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a>.
</p>
<p>
- For each <abbr title="Hypertext Transfer Protocol">HTTP</abbr> Response following an initial <a>search
- request for <abbr title="Discovery and Launch Protocol">DIAL</abbr> devices</a> sent on a <a href=
- "#dfn-standard-upnp-address-and-port"
+ For each <abbr title="Hypertext Transfer Protocol">HTTP</abbr> Response following an initial <a href=
+ "#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> sent on a <a href="#dfn-standard-upnp-address-and-port"
class="internalDFN">standard UPnP address and port</a> the user agent <em class="rfc2119"
title="MUST">MUST</em> run the following steps:
</p>
@@ -2460,22 +2471,27 @@
<em class="rfc2119"
title="MUST">MUST</em> discard this response, abort any remaining steps and return. The user agent
<em class="rfc2119"
- title="MAY">MAY</em> issue a new <a>search request for <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> devices</a> as a result of this error occurring.
+ title="MAY">MAY</em> issue a new <a href="#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> as a result of this error occurring.
</li>
<li>If the <a href="#dfn-maximum-dial-advertisement-response-wait-time"
class="internalDFN">maximum <abbr title="Discovery and Launch Protocol">DIAL</abbr> advertisement
- response wait time</a> has been exceeded since the initial <a>search request for <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> devices</a> was sent then the <a href="#dfn-http-response"
+ response wait time</a> has been exceeded since the initial <a href=
+ "#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> was sent then the <a href="#dfn-http-response"
class="internalDFN"><abbr title="Hypertext Transfer Protocol">HTTP</abbr> Response</a> is invalid and
the user agent <em class="rfc2119"
title="MUST">MUST</em> discard this response, abort any remaining steps and return. The user agent
<em class="rfc2119"
- title="MAY">MAY</em> stop listening for responses from the current <a>search request for <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> devices</a> as a result of this error occurring. Equally,
- the user agent <em class="rfc2119"
- title="MAY">MAY</em> issue a new <a>search request for <abbr title=
- "Discovery and Launch Protocol">DIAL</abbr> devices</a> as a result of this error occurring.
+ title="MAY">MAY</em> stop listening for responses from the current <a href=
+ "#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> as a result of this error occurring. Equally, the user agent <em class="rfc2119"
+ title="MAY">MAY</em> issue a new <a href="#dfn-search-request-for-dial-enabled-devices"
+ class="internalDFN">search request for <abbr title="Discovery and Launch Protocol">DIAL</abbr>-enabled
+ devices</a> as a result of this error occurring.
</li>
<li>Let <var>dial device</var> be an Object with a property for each <abbr title=
"Hypertext Transfer Protocol">HTTP</abbr> header received in the <a href="#dfn-http-response"
@@ -2624,8 +2640,9 @@
</td>
<td>
When a <a href="#dfn-new-service"
- class="internalDFN">new service</a> that matches one of the <a>requested type tokens</a> is found in
- the current network.
+ class="internalDFN">new service</a> that matches one of the <a title="valid service type"
+ href="#dfn-valid-service-type"
+ class="internalDFN">requested type tokens</a> is found in the current network.
</td>
</tr>
<tr>
@@ -2638,8 +2655,9 @@
</td>
<td>
When an <a href="#dfn-existing-service"
- class="internalDFN">existing service</a> that matches one of the <a>requested type tokens</a>
- gracefully leaves or expires from the current network.
+ class="internalDFN">existing service</a> that matches one of the <a title="valid service type"
+ href="#dfn-valid-service-type"
+ class="internalDFN">requested type tokens</a> gracefully leaves or expires from the current network.
</td>
</tr>
<tr>
@@ -2708,11 +2726,11 @@
<p class="">
For example, if a <a href="#networkservices"
class="internalDFN"><code>NetworkServices</code></a> object has one or more <a href=
- "#dfn-indexed-properties-1"
+ "#dfn-indexed-properties"
class="internalDFN">indexed properties</a> attached to it then there is a strong reference from that
<a href="#networkservices"
class="internalDFN"><code>NetworkServices</code></a> object toward each of its <a href=
- "#dfn-indexed-properties-1"
+ "#dfn-indexed-properties"
class="internalDFN">indexed properties</a>.
</p>
</div>
@@ -3257,8 +3275,8 @@
date (in alphabetical order):<br>
<br>
Adam Barth, Gar Bergstedt, Robin Berjon, Lars-Erik Bolstad, Marcos Caceres, Cathy Chan, Daniel Danciu,
- Jean-Claude Dufourd, Mark Foltz, Dominique Hazael-Massieux, Frederick Hirsch, Hari G Kumar, Bob Lund, Giuseppe
- Pascale, Marcin Simonides, Clarke Stevens, Christian Söderström, Mark Vickers.
+ Jean-Claude Dufourd, Youenn Fablot, Mark Foltz, Dominique Hazael-Massieux, Frederick Hirsch, Tatsuya Igarashi,
+ Hari G Kumar, Bob Lund, Giuseppe Pascale, Marcin Simonides, Clarke Stevens, Christian Söderström, Mark Vickers.
</p>
<p>
Thanks are also expressed by the editor to the following organizations and groups for their support in
@@ -3268,12 +3286,15 @@
"World Wide Web Consortium">W3C</abbr> Device APIs Working Group, <abbr title=
"World Wide Web Consortium">W3C</abbr> Web and TV Interest Group.
</p>
- </section>
+ </section><style>
+a.externalDFN { color: #00C; border-bottom: 1px dashed #00C; }
+ a.internalDFN { color: #00C; text-decoration: solid; }
+ </style>
<section id="references"
class="appendix"
typeof="bibo:Chapter"
- resource="#references"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h2 aria-level="1"
role="heading"
id="h2_references">
@@ -3281,8 +3302,8 @@
</h2>
<section id="normative-references"
typeof="bibo:Chapter"
- resource="#normative-references"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h3 aria-level="2"
role="heading"
id="h3_normative-references">
@@ -3357,8 +3378,8 @@
</section>
<section id="informative-references"
typeof="bibo:Chapter"
- resource="#informative-references"
- rel="bibo:chapter">
+ resource="#ref"
+ rel="bibo:Chapter">
<h3 aria-level="2"
role="heading"
id="h3_informative-references">
@@ -3376,9 +3397,6 @@
</dd>
</dl>
</section>
- </section><style>
-a.externalDFN { color: #00C; border-bottom: 1px dashed #00C; }
- a.internalDFN { color: #00C; text-decoration: solid; }
- </style>
+ </section>
</body>
</html>
--- a/discovery-api/Overview.src.html Thu Oct 10 12:36:37 2013 +1100
+++ b/discovery-api/Overview.src.html Mon Oct 28 11:31:42 2013 +1100
@@ -489,7 +489,7 @@
<li>Let <var>requested control types</var> be initially set to an empty array.
</li>
<li>If <var>type</var> is an array consisting of one or more <a>valid service type</a> tokens, then let
- <var>requested control types</var> by the value of <var>type</var>, removing any non-<a>valid service
+ <var>requested control types</var> be the value of <var>type</var>, removing any non-<a>valid service
type</a> tokens from the resulting array.
</li>
<li>If <var>type</var> is a string consisting of one <a>valid service type</a> token, then let
@@ -745,7 +745,7 @@
</h2>
<p>
The <a href="#networkservices"><code>NetworkServices</code></a> interface represents a collection of zero or
- more <dfn>indexed properties</dfn> that are each a <a>user-authorized</a> <a href=
+ more <a>indexed properties</a> that are each a <a>user-authorized</a> <a href=
"#networkservice"><code>NetworkService</code></a> object.
</p>
<p>
@@ -1640,30 +1640,31 @@
(currently, <var>dial version</var> can only be <code>1</code>)
</p>
<p>
- The user agent MUST issue all <a title="search request for DIAL devices">search requests for DIAL devices</a>
- with a HTTP request line equal to <code>M-SEARCH * HTTP/1.1</code>, with a HOST header equal to the reserved
- multicast address and port of <code>239.255.255.250:1900</code>, a MAN header equal to
- <code>ssdp:discover</code>, an ST header equal to <var>dial search target</var> and a user-agent defined MX
- header equal to a <dfn>maximum DIAL advertisement response wait time</dfn> value between <code>1</code> and
- <code>5</code> seconds.
+ The user agent MUST issue all <a title="search request for DIAL-enabled devices">search requests for
+ DIAL-enabled devices</a> with a HTTP request line equal to <code>M-SEARCH * HTTP/1.1</code>, with a HOST
+ header equal to the reserved multicast address and port of <code>239.255.255.250:1900</code>, a MAN header
+ equal to <code>ssdp:discover</code>, an ST header equal to <var>dial search target</var> and a user-agent
+ defined MX header equal to a <dfn>maximum DIAL advertisement response wait time</dfn> value between
+ <code>1</code> and <code>5</code> seconds.
</p>
<p>
- The user agent MUST listen for any incoming responses to a <a>search request for DIAL devices</a>.
+ The user agent MUST listen for any incoming responses to a <a>search request for DIAL-enabled devices</a>.
</p>
<p>
- For each HTTP Response following an initial <a>search request for DIAL devices</a> sent on a <a>standard UPnP
- address and port</a> the user agent MUST run the following steps:
+ For each HTTP Response following an initial <a>search request for DIAL-enabled devices</a> sent on a
+ <a>standard UPnP address and port</a> the user agent MUST run the following steps:
</p>
<ol class="rule">
<li>If the HTTP Response is not a HTTP 200 OK response then this response is invalid and the user agent MUST
discard this response, abort any remaining steps and return. The user agent MAY issue a new <a>search request
- for DIAL devices</a> as a result of this error occurring.
+ for DIAL-enabled devices</a> as a result of this error occurring.
</li>
<li>If the <a>maximum DIAL advertisement response wait time</a> has been exceeded since the initial <a>search
- request for DIAL devices</a> was sent then the <a>HTTP Response</a> is invalid and the user agent MUST
- discard this response, abort any remaining steps and return. The user agent MAY stop listening for responses
- from the current <a>search request for DIAL devices</a> as a result of this error occurring. Equally, the
- user agent MAY issue a new <a>search request for DIAL devices</a> as a result of this error occurring.
+ request for DIAL-enabled devices</a> was sent then the <a>HTTP Response</a> is invalid and the user agent
+ MUST discard this response, abort any remaining steps and return. The user agent MAY stop listening for
+ responses from the current <a>search request for DIAL-enabled devices</a> as a result of this error
+ occurring. Equally, the user agent MAY issue a new <a>search request for DIAL-enabled devices</a> as a result
+ of this error occurring.
</li>
<li>Let <var>dial device</var> be an Object with a property for each HTTP header received in the <a>HTTP
Response</a>, with each key being the name of a HTTP response header and each value being that HTTP response
@@ -1784,8 +1785,8 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When a <a>new service</a> that matches one of the <a>requested type tokens</a> is found in the current
- network.
+ When a <a>new service</a> that matches one of the <a title="valid service type">requested type tokens</a>
+ is found in the current network.
</td>
</tr>
<tr>
@@ -1797,8 +1798,8 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When an <a>existing service</a> that matches one of the <a>requested type tokens</a> gracefully leaves or
- expires from the current network.
+ When an <a>existing service</a> that matches one of the <a title="valid service type">requested type
+ tokens</a> gracefully leaves or expires from the current network.
</td>
</tr>
<tr>
@@ -2142,8 +2143,8 @@
date (in alphabetical order):<br>
<br>
Adam Barth, Gar Bergstedt, Robin Berjon, Lars-Erik Bolstad, Marcos Caceres, Cathy Chan, Daniel Danciu,
- Jean-Claude Dufourd, Mark Foltz, Dominique Hazael-Massieux, Frederick Hirsch, Hari G Kumar, Bob Lund, Giuseppe
- Pascale, Marcin Simonides, Clarke Stevens, Christian Söderström, Mark Vickers.
+ Jean-Claude Dufourd, Youenn Fablot, Mark Foltz, Dominique Hazael-Massieux, Frederick Hirsch, Tatsuya Igarashi,
+ Hari G Kumar, Bob Lund, Giuseppe Pascale, Marcin Simonides, Clarke Stevens, Christian Söderström, Mark Vickers.
</p>
<p>
Thanks are also expressed by the editor to the following organizations and groups for their support in