--- a/discovery-api/Overview.html Fri Feb 08 15:09:39 2013 +0100
+++ b/discovery-api/Overview.html Fri Feb 08 15:11:05 2013 +0100
@@ -222,8 +222,8 @@
id="title">
Network Service Discovery
</h1>
- <h2 id="w3c-editor-s-draft-05-february-2013">
- <abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft 05 February 2013
+ <h2 id="w3c-editor-s-draft-08-february-2013">
+ <abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft 08 February 2013
</h2>
<dl>
<dt>
@@ -709,6 +709,26 @@
"Hypertext Transfer Protocol">HTTP</abbr> NOTIFY requests from UPnP Event sources. It is only required when
the user agent implements UPnP Service Discovery as defined in this specification.
</p>
+ <p>
+ In this specification we use the following terms to describe the processes required for Local-networked
+ Services management:
+ </p>
+ <ul>
+ <li>A <dfn id="dfn-new-service">new service</dfn> is a Local-networked Service that has not previously been
+ discovered or registered in the <a href="#dfn-list-of-available-service-records"
+ class="internalDFN">list of available service records</a>.
+ </li>
+ <li>An <dfn id="dfn-existing-service">existing service</dfn> is a Local-networked Service that has previously
+ been discovered and is registered in the <a href="#dfn-list-of-available-service-records"
+ class="internalDFN">list of available service records</a>.
+ </li>
+ <li>A <dfn id="dfn-current-service">current service</dfn> is a Local-networked Service, represented by a
+ <a href="#networkservice"><code>NetworkService</code></a> object, that is currently being shared with a web
+ page via a <a href="#networkservices"><code>NetworkServices</code></a> object registered in the <a href=
+ "#dfn-list-of-active-service-managers"
+ class="internalDFN">list of active service managers</a>.
+ </li>
+ </ul>
</section>
<section id="requesting-networked-services">
<h2>
@@ -1172,8 +1192,10 @@
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>. A <a href="#networkservices"><code>NetworkServices</code></a>
- object is <span>immutable</span> meaning that <a href="#dfn-indexed-properties-1"
+ class="internalDFN">indexed properties</a>. The <a href="#dfn-indexed-properties-1"
+ 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"
class="internalDFN">indexed properties</a> cannot be removed for the lifetime of a <a href=
"#networkservices"><code>NetworkServices</code></a> object.
@@ -1531,8 +1553,10 @@
</p>
<p>
The rule for <dfn id="dfn-adding-an-available-service">adding an available service</dfn> is the process of
- adding a new service or updating an existing service that is generally available on the user's current network
- in the <a href="#dfn-list-of-available-service-records"
+ adding a <a href="#dfn-new-service"
+ class="internalDFN">new service</a> or updating an <a href="#dfn-existing-service"
+ class="internalDFN">existing service</a> that is generally available on the user's current network in the
+ <a href="#dfn-list-of-available-service-records"
class="internalDFN">list of available service records</a>. This rule takes one argument, <var>network
service record</var>, and consists of running the following steps:
</p>
@@ -1600,7 +1624,8 @@
</ol>
<p>
The rule for <dfn id="dfn-removing-an-available-service">removing an available service</dfn> is the general
- process of removing a service from the <a href="#dfn-list-of-available-service-records"
+ process of removing an <a href="#dfn-existing-service"
+ class="internalDFN">existing service</a> from the <a href="#dfn-list-of-available-service-records"
class="internalDFN">list of available service records</a> that has left the user's current network or has
otherwise expired. This rule takes one argument, <var>service identifier</var>, and consists of running the
following steps:
@@ -2356,7 +2381,9 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When a new service that matches one of the <a>requested type tokens</a> is found in the current network.
+ 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.
</td>
</tr>
<tr>
@@ -2368,8 +2395,9 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When an existing service that matches one of the <a>requested type tokens</a> gracefully leaves or
- expires from the current network.
+ 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.
</td>
</tr>
<tr>
@@ -2381,7 +2409,8 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When a current service renews its service registration within the current network.
+ When a <a href="#dfn-current-service"
+ class="internalDFN">current service</a> renews its service registration within the current network.
</td>
</tr>
<tr>
@@ -2393,7 +2422,9 @@
class="externalDFN"><code>Event</code></a>
</td>
<td>
- When a current service gracefully leaves or otherwise expires from the current network.
+ When a <a href="#dfn-current-service"
+ class="internalDFN">current service</a> gracefully leaves or otherwise expires from the current
+ network.
</td>
</tr>
<tr>
@@ -2407,8 +2438,8 @@
<td>
When a valid UPnP Events Subscription Message is received on a <a href=
"#dfn-user-agent-generated-callback-url"
- class="internalDFN">user-agent generated callback url</a> for a current service. This event never
- fires for Zeroconf-based services.
+ class="internalDFN">user-agent generated callback url</a> for a <a href="#dfn-current-service"
+ class="internalDFN">current service</a>. This event never fires for Zeroconf-based services.
</td>
</tr>
</tbody>