--- a/model/diff.html Mon Jul 09 21:50:36 2012 +0100
+++ b/model/diff.html Mon Jul 09 21:50:56 2012 +0100
@@ -521,7 +521,7 @@
pre.sh_sourceCode .sh_paren { color: red; }
pre.sh_sourceCode .sh_attribute { color: #006400; }
-</style><style type="text/css">
+</style><span class="delete">
/* --- EDITORIAL NOTES --- */
.component1-color {
background-color: rgba(255,42,42,0.2);
@@ -971,7 +971,7 @@
font-size:120%;
font-family: monospace;
}
-</style><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
+</span><link href="./extra-dm.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
<body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle">Final review before Last Call Vote (WD6) (<a href="diff.html">Diffs since last release</a>)</h2><h2 id="w3c-editor-s-draft-09-july-2012"><acronym title="World Wide Web Consortium">W3C</acronym> Editor's Draft <span class="delete">28 June</span><span class="insert">09 July</span> 2012</h2><dl><dt>This version:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120503/">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
<dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
<dt>Authors:</dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
@@ -2092,7 +2092,7 @@
<tr class="component6-color"><td class="provType"><a href="#concept-collection" class="internalDFN">Collection</a></td><td><a title="collection" href="#concept-collection" class="internalDFN">... prov:type='prov:Collection' ...</a></td><td rowspan="3"><a href="#component6">Component 6: Collections</a></td></tr>
<tr class="component6-color"><td class="provType"><a title="empty collection" href="#concept-empty-collection" class="internalDFN">EmptyCollection</a></td><td><a title="empty collection" href="#concept-empty-collection" class="internalDFN">... prov:type='prov:EmptyCollection' ...</a></td></tr>
-<tr class="component6-color"><td><a href="#concept-collection-membership" class="internalDFN">Collection Membership</a></td><td><a title="memberOf" href="#dfn-memberof" class="internalDFN">memberOf(id; c, {e_1, ..., e_n}, cplt, attrs)</a></td></tr>
+<tr class="component6-color"><td><a href="#concept-collection-membership" class="internalDFN">Collection Membership</a></td><td><span class="delete">memberOf(id;</span><a title="hadMembers" href="#dfn-hadmembers" class="internalDFN"><span class="insert">hadMembers(id;</span> c, {e_1, ..., e_n}, cplt, attrs)</a></td></tr>
</tbody></table>
</div>
@@ -2233,7 +2233,7 @@
<div id="term-Usage" class="section">
<h4><span class="secno">5.1.4 </span>Usage</h4>
-<div class="glossary-ref"> <dfn id="concept-usage" class="internalDFN">Usage</dfn><sup><a class="internalDFN" href="#concept-usage"><span class="diamond"> ◊</span></a></sup> is the beginning of utilizing an entity by an activity. Before usage, the activity had not begun to utilize this entity and could not have been affected by the entity. </div>
+<p><span class="glossary-ref"> <dfn id="concept-usage" class="internalDFN">Usage</dfn><sup><a class="internalDFN" href="#concept-usage"><span class="diamond"> ◊</span></a></sup> is the beginning of utilizing an entity by an activity. Before usage, the activity had not begun to utilize this entity and could not have been affected by the entity. </span><span class="insert"> (Note: This definition is formulated for a given usage; it is permitted for an activity to have used a same entity multiple times.)</span></p>
<p></p><div class="attributes" id="attributes-usage"><dfn title="used" id="dfn-used" class="internalDFN">Usage</dfn><sup><a class="internalDFN" href="#dfn-used"><span class="diamond"> ◊</span></a></sup><span class="withPn">, written <span class="pnExpression">used(id; a, e, t, attrs)</span> in PROV-N,</span> has:
@@ -2466,14 +2466,14 @@
<a href="http://www.bbc.co.uk/news/uk-17595024">bbc:news/uk-17595024</a>,
but the BBC news home page on the next day did not.
</p><pre class="codeexample">entity(ex:bbcNews2012-04-03)
-memberOf(ex:bbcNews2012-04-03, {bbc:news/uk-17595024})
+<span class="delete">memberOf(ex:bbcNews2012-04-03,</span><span class="insert">hadMembers(ex:bbcNews2012-04-03,</span> {bbc:news/uk-17595024})
wasGeneratedBy (ex:bbcNews2012-04-03, -, 2012-04-03T00:00:01)
wasInvalidatedBy(ex:bbcNews2012-04-03, -, 2012-04-03T23:59:59)
</pre>
We refer to example
<a href="#anexample-specialization" class="anexample-ref"><span>Example 42</span></a>
- for further descriptions of the BBC Web site, and to <a href="#term-collection-membership">Section 5.6.2</a> for a description of the relation <a title="memberOf" href="#dfn-memberof" class="internalDFN">memberOf</a>.
+ for further descriptions of the BBC Web site, and to <a href="#term-collection-membership">Section 5.6.2</a> for a description of the relation <span class="delete">memberOf</span><a title="hadMembers" href="#dfn-hadmembers" class="internalDFN"><span class="insert">hadMembers</span></a>.
</div>
@@ -3009,7 +3009,7 @@
<p>A bundle's identifier <span class="name">id</span> identifies a unique set of descriptions.</p>
</div>
-<p>There may be other kinds of bundles not directly expressible by this constructor, such as <span class="delete">napkin,</span><span class="insert">provenance descriptions handwritten on a letter or a</span> whiteboard, etc. What ever the means by which bundles are expressed, all can be described, as in the following section.</p>
+<p>There may be other kinds of bundles not directly expressible by this constructor, such as <span class="delete">napkin,</span><span class="insert">provenance descriptions handwritten on a letter or a</span> whiteboard, etc. <span class="delete">What ever</span><span class="insert">Whatever</span> the means by which bundles are expressed, all can be described, as in the following section.</p>
</div>
@@ -3243,7 +3243,7 @@
<div class="note">
-<p><span class="insert">Note: </span>This <span class="insert">feature is "</span><a href="http://www.w3.org/2005/10/Process-20051014/tr#cfi"><span class="insert">at risk</span></a><span class="insert">" and may be removed from this specification based on feedback. Please send feedback to public-prov-comments@w3.org.</span></p>
+<p>This <span class="insert">feature is "</span><a href="http://www.w3.org/2005/10/Process-20051014/tr#cfi"><span class="insert">at risk</span></a><span class="insert">" and may be removed from this specification based on feedback. Please send feedback to public-prov-comments@w3.org.</span></p>
<p><span class="insert">The "Mention" </span>construct <span class="delete">is a </span><span class="delete">FEATURE AT RISK</span><span class="delete">.
</span><span class="insert">might be removed from PROV if implementation experience reveals problems with supporting this construct.</span></p>
</div>
@@ -3417,8 +3417,8 @@
<p>
-</p><div class="attributes" id="attributes-memberOf">
- A <dfn title="memberOf" id="dfn-memberof" class="internalDFN">membership</dfn><sup><a class="internalDFN" href="#dfn-memberof"><span class="diamond"> ◊</span></a></sup> relation, written <span class="pnExpression">memberOf(id; c, {e_1, ..., e_n}, cplt, attrs)</span>, has:
+</p><div class="attributes" id="attributes-hadMembers">
+ A <dfn title="hadMembers" id="dfn-hadmembers" class="internalDFN">membership</dfn><sup><a class="internalDFN" href="#dfn-hadmembers"><span class="diamond"> ◊</span></a></sup> relation, written <span class="pnExpression"><span class="delete">memberOf(id;</span><span class="insert">hadMembers(id;</span> c, {e_1, ..., e_n}, cplt, attrs)</span>, has:
<ul>
<li><span class="attribute" id="membership.id">id</span>: an <em class="rfc2119" title="optional">optional</em> identifier identifying the relation;</li>
<li><span class="attribute" id="membership.collection">collection</span>: an identifier (<span class="name">c</span>) for the collection whose members are asserted; </li>
@@ -3438,7 +3438,7 @@
</div>
<p id="complete-attribute-note">
-Note that the attribute <a href="#membership.complete">complete</a> indicates that the <a title="memberOf" href="#dfn-memberof" class="internalDFN">membership</a> relation provides a complete description of the collection membership. It is possible for different provenance descriptions to provide different membership statements regarding the same collection. The resolution of any potential conflict amongst such membership statements is defined by applications.</p>
+Note that the attribute <a href="#membership.complete">complete</a> indicates that the <a title="hadMembers" href="#dfn-hadmembers" class="internalDFN">membership</a> relation provides a complete description of the collection membership. It is possible for different provenance descriptions to provide different membership statements regarding the same collection. The resolution of any potential conflict amongst such membership statements is defined by applications.</p>
</div>