--- a/wi-addendum-local-services/Overview.html Sat Jul 07 09:13:13 2012 +0200
+++ b/wi-addendum-local-services/Overview.html Mon Jul 09 09:59:54 2012 +0200
@@ -147,7 +147,7 @@
<ul>
<li><dfn>UPnP enabled User Agent</dfn>: A <a>UPnP enabled User Agent</a> MUST support Web Intents [[!WEBINTENTS]] and the conformance criteria
stated in this specification. </li>
- <li><dfn>UPnP enabled device</dfn>: A <a>UPnP enabled device</a> MUST support [[!UPNP-DEVICEARCH]] and the conformance criteria
+ <li><dfn>Web Intents enabled UPnP device</dfn>: A <a>Web Intents enabled UPnP device</a> MUST support [[!UPNP-DEVICEARCH]] and the conformance criteria
stated in this specification. </li>
</ul>
@@ -192,7 +192,7 @@
The <a>UPnP enabled User Agent</a> has the role of a <dfn id="dfn-registration">control point</dfn> according to UPnP terminology.
</p>
<p>
- The <a>UPnP enabled device</a> discovered by the <a>UPnP enabled User Agent</a> has the roles of <dfn id="dfn-registration">device</dfn> according to UPnP terminology.
+ The <a>Web Intents enabled UPnP device</a> discovered by the <a>UPnP enabled User Agent</a> has the roles of <dfn id="dfn-registration">device</dfn> according to UPnP terminology.
</p>
</section>
@@ -212,10 +212,10 @@
<section>
- <h3><a>UPnP enabled device</a></h3>
+ <h3><a>Web Intents enabled UPnP device</a></h3>
<p>
- The <a>UPnP enabled device</a> <em class="rfc2119" title="must">must</em> support this section.
+ The <a>Web Intents enabled UPnP device</a> <em class="rfc2119" title="must">must</em> support this section.
</p>
<section>
@@ -223,13 +223,13 @@
<h4>UPnP Web Intents serviceType</h4>
<p>
- The <a>UPnP enabled device</a> <em class="rfc2119" title="must">must</em> support the UPnP service which serviceType is the <code>urn:schemas-webintents-org:service:WebIntents:1</code>
- as a vendor specific serviceType according to [[!UPNP-DEVICEARCH]]. It is vendor dependent how the <a>UPnP enabled device</a> implements the serviceType,
+ The <a>Web Intents enabled UPnP device</a> <em class="rfc2119" title="must">must</em> support one UPnP service which serviceType is the <code>urn:schemas-webintents-org:service:WebIntents:1</code>
+ as a vendor specific serviceType according to [[!UPNP-DEVICEARCH]]. It is vendor dependent how the <a>Web Intents enabled UPnP device</a> implements the serviceType,
i.e. a device description of any deviceType could include this serviceType.
</p>
<p>
- The Web Intents serviceType <em class="rfc2119" title="must">must</em> have a dummy state variable, <code>X_State</code> of <code>ui4</code> data type to comform to [[!UPNP-DEVICEARCH]]
+ The Web Intents serviceType <em class="rfc2119" title="must">must</em> have a dummy state variable, <code>X_State</code> of <code>boolean</code> data type to comform to [[!UPNP-DEVICEARCH]]
which requires one or more state variables in a serviceType. The <code>X_State</code> state variable is not used with a value and is never evented.
</p>
<p>
@@ -252,13 +252,13 @@
<h4>Web Intents specific SSDP headers</h4>
<p>
- The <a>UPnP enabled device</a> <em class="rfc2119" title="must">must</em> support SSDP discovery process based on standard UPnP Discovery extended with 2 additional
+ The <a>Web Intents enabled UPnP device</a> <em class="rfc2119" title="must">must</em> support SSDP discovery process based on standard UPnP Discovery extended with 2 additional
SSDP headers for M-SEARCH response and NOTIFY when ST/NT headers are:<code>urn:schemas-webintents-org:service:WebIntents:1</code>
</p>
<ul>
<li>
- <code>location.webintents.org</code>: <em class="rfc2119" title="required">required</em>. States the location to the Web Intents document in the <a>UPnP enabled device</a>.
+ <code>location.webintents.org</code>: <em class="rfc2119" title="required">required</em>. States the location to the Web Intents document in the <a>Web Intents enabled UPnP device</a>.
If the value of this header is a relative URL the base URL is the base URL of the <code>LOCATION</code> header.
</li>
<li>
@@ -266,7 +266,7 @@
<code>action</code> of the supported Web Intents Services and <em class="rfc2119" title="must">must</em>
match the <code>action</code> attributes of the Service registration markup in the Web Intents document. To support more than
one Web Intents <code>action</code> the action strings <em class="rfc2119" title="must">must</em> be separated with
- one or more commas. Commas included in action strings <em class="rfc2119" title="must">must</em> be percent-encoded as
+ comma. Commas included in action strings <em class="rfc2119" title="must">must</em> be percent-encoded as
defined in [[!RFC3986]], section-2.1.
<br /> <br />
This header allows the <a>UPnP enabled User Agent</a> to filter received SSDP messages so that the <a>UPnP enabled User Agent</a>s only have to
@@ -281,7 +281,7 @@
<h4>Web Intents document</h4>
<p>
- The <a>UPnP enabled device</a> <em class="rfc2119" title="must">must</em> store Web Intents documents for the Web Intents Services the <a>UPnP enabled device</a> supports.
+ The <a>Web Intents enabled UPnP device</a> <em class="rfc2119" title="must">must</em> host Web Intents documents for the Web Intents Services the <a>Web Intents enabled UPnP device</a> supports.
Web Intents documents are html pages that contain Web Intents Service registration markup according to the rules for Web Intents Service registration defined
by [[!WEBINTENTS]]. They may also contain Service handler code for Services registered within the same document.
</p>
@@ -293,7 +293,7 @@
<h4>Web Intents Service pages</h4>
<p>
- The <a>UPnP enabled device</a> <em class="rfc2119" title="must">must</em> store a Web Intents Service page for each Service that is
+ The <a>Web Intents enabled UPnP device</a> <em class="rfc2119" title="must">must</em> host a Web Intents Service page for each Service that is
referred in Web Intents documents through <code>href</code> attributes in the registration markup.
</p>
<p>
@@ -309,7 +309,7 @@
<h3><a>UPnP enabled User Agent</a></h3>
<p>
- The <a>UPnP enabled User Agent</a> <em class="rfc2119" title="must">must</em> support discovery of <a>UPnP enabled device<a>s through SSDP Discovery or through Advertisement
+ The <a>UPnP enabled User Agent</a> <em class="rfc2119" title="must">must</em> support discovery of <a>Web Intents enabled UPnP device<a>s through SSDP Discovery or through Advertisement
or through both methods according to [[!UPNP-DEVICEARCH]] and according to the Web Intents serviceType and Web Intents specific SSDP headers
defined in this specification, section 4.1.
</p>
@@ -337,15 +337,15 @@
<li>
For each matching M-SEARCH response, i.e. the response ST header is <code>urn:schemas-webintents-org:service:WebIntents:1</code> and the <code>action.webintents.org</code>
header, if present, matches the Action of the invoked intent,
- the <a>UPnP enabled User Agent</a> attempts to retrieve the Web Intents document from the discovered <a>UPnP enabled device</a>.
+ the <a>UPnP enabled User Agent</a> attempts to retrieve the Web Intents document from the discovered <a>Web Intents enabled UPnP device</a>.
The value of the <code>location.webintents.org</code> header is the location for the Web Intents document.
If this value is a relative URL the <a>UPnP enabled User Agent</a> uses the base URL of the <code>LOCATION</code> header as base URL for the location of the
Web Intents document.
<br /> <br />
- If the <a>UPnP enabled User Agent</a> fails to retrieve the Web Intents document it silently disregards the discovered Service.
+ If the <a>UPnP enabled User Agent</a> fails to retrieve the Web Intents document it silently disregards the received M-SEARCH response.
<br /> <br />
If the <code>action.webintents.org</code> header is present and does not match the <code>action</code> attributes of the Services registered in the retrieved Web Intents
- document the <a>UPnP enabled User Agent</a> silently disregards the discovered Service.
+ document the <a>UPnP enabled User Agent</a> silently disregards the the received M-SEARCH response.
</li>
<br />
<li>
@@ -354,7 +354,7 @@
</li>
<br />
<li>
- The <a>UPnP enabled User Agent</a> makes each dynamically registered Service available for selection
+ The <a>UPnP enabled User Agent</a> makes each dynamically registered Service, that matches the Action of the invoked intent, available for selection
by the user, typically by making them visible and selectable in a Web Intents Service picker.
</li>
<br />
@@ -375,7 +375,7 @@
</p>
<p>
- The <a>UPnP enabled User Agent</a> <em class="rfc2119" title="may">may</em> continously listen and act on advertisments according to the following steps:
+ The <a>UPnP enabled User Agent</a> <em class="rfc2119" title="may">may</em> continuously listen to and act on advertisments according to the following steps:
</p>
<ol class="rule">
@@ -390,15 +390,15 @@
</li>
<br />
<li>
- For each match the <a>UPnP enabled User Agent</a> attempts to retrieve the Web Intents document document from the discovered <a>UPnP enabled device</a>. The <a>UPnP enabled User Agent</a>
+ For each match the <a>UPnP enabled User Agent</a> attempts to retrieve the Web Intents document document from the discovered <a>Web Intents enabled UPnP device</a>. The <a>UPnP enabled User Agent</a>
may also attempt to retrieve the Web Intents document for announced services without an <code>action.webintents.org</code> header.
The location of the Web Intents document is the value of the <code>location.webintents.org</code> header. If this value is a relative URL the
base URL is the base URL of the <code>LOCATION</code> header.
<br /> <br />
- If the <a>UPnP enabled User Agent</a> fails to retrieve the Web Intents document it silently disregards the discovered Service.
+ If the <a>UPnP enabled User Agent</a> fails to retrieve the Web Intents document it silently disregards the received NOTIFY message.
<br /> <br />
If the <code>action.webintents.org</code> header does not match the <code>action</code> attribute in the retrieved Web Intents document
- the <a>UPnP enabled User Agent</a> silently disregards the discovered Service.
+ the <a>UPnP enabled User Agent</a> silently disregards the received NOTIFY message.
</li>
<br />
<li>
@@ -407,7 +407,7 @@
</li>
<br />
<li>
- The <a>UPnP enabled User Agent</a> makes each dynamically registered Service available for selection
+ The <a>UPnP enabled User Agent</a> makes each dynamically registered Service, that matches the Action of the invoked intent, available for selection
by the user, typically by making them visible and selectable in a Web Intents Service picker.
</li>
<br />
@@ -428,8 +428,8 @@
<section class='informative'>
<h4>Support for Web Intents and UPnP</h4>
<p>
- In addition to the normative statements defined in this specification it is assumed that <a>UPnP enabled User Agent</a>s that comply to this specification
- support Web Intents according to [[!WEBINTENTS]] and UPnP Discovery, Description and Control according to [[!UPNP-DEVICEARCH11]].
+ In addition to the normative statements defined in this specification a <a>UPnP enabled User Agent</a> that complies to this specification
+ supports Web Intents according to [[!WEBINTENTS]] and UPnP Discovery, Description and Control according to [[!UPNP-DEVICEARCH]].
However, it is implementation dependent whether this is supported natively in the User Agent or supported through some external component,
e.g. an in-device web server.
</p>
@@ -440,9 +440,9 @@
<h4>Service availability management</h4>
<p>
- The <a>UPnP enabled User Agent</a> must manage the availability of UPnP services. For example detect when contact with a <a>UPnP enabled device</a> is lost through standard
+ The <a>UPnP enabled User Agent</a> should manage the availability of UPnP services. For example detect when contact with a <a>Web Intents enabled UPnP device</a> is lost through standard
UPnP life cycle management and remove a previously discovered and registered Service from the Service picker. However, for battery powered devices
- power consumption must be considered and long lasting "keep alive" sessions" should be avoided.
+ power consumption should be considered and long lasting "keep alive" sessions" should be avoided.
</p>
</section>
@@ -483,7 +483,7 @@
</p>
<ul>
<li>
- A Client application invoking a "View" intent provides, as intent payload data, a link to a video to be displayed at the remote <a>UPnP enabled device</a>.
+ A Client application invoking a "View" intent provides, as intent payload data, a link to a video to be displayed at the remote <a>Web Intents enabled UPnP device</a>.
The Service application takes full control of the video playback by providing control buttons and sends UPnP commands to the remote device.
So in this case there the simple "API" just gives the link to the video to play.
</li>