--- a/model/diff.html Mon Oct 29 22:40:24 2012 -0700
+++ b/model/diff.html Tue Oct 30 10:07:50 2012 +0000
@@ -1,3 +1,4 @@
+
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
<html lang="en" dir="ltr">
<head><style type="text/css"><!--
@@ -1026,7 +1027,7 @@
pre.sh_sourceCode .sh_attribute { color: #006400; }
</style><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"><a href="diff.html"><span class="insert">Changes</span></a><span class="insert"> since LC release</span></h2><h2 id="w3c-editor-s-draft-26-october-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">26 October</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></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><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><span class="delete"> (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
+ <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"><a href="diff.html"><span class="insert">Changes</span></a><span class="insert"> since LC release</span></h2><h2 id="w3c-editor-s-draft-30-october-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">30 October</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></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><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><span class="delete"> (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span></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><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
<dd><span>Reza B'Far</span>, Oracle Corporation</dd>
@@ -2253,7 +2254,7 @@
<p></p><div class="attributes" id="attributes-entity">An <dfn title="dfn-Entity" id="dfn-entity" class="internalDFN">entity</dfn><sup><a class="internalDFN" href="#dfn-entity"><span class="diamond"> ◊</span></a></sup><span class="withPn">, written <span class="pnExpression" id="pn-entity">entity(id, [attr1=val1, ...])</span> in PROV-N, </span> has:
<ul>
<li><span class="attribute" id="entity.id">id</span>: an identifier for an entity; </li>
-<li><span class="attribute" id="entity.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set of attribute-value pairs ((<span class="name">attr1</span>, <span class="name">val1</span>), ...) representing additional information about this entity.</li>
+<li><span class="attribute" id="entity.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set of attribute-value pairs ((<span class="name">attr1</span>, <span class="name">val1</span>), ...) representing additional information about <span class="insert">the fixed aspects of </span>this entity.</li>
</ul></div>
<div class="anexample" id="anexample-entity"><div class="anexampleTitle">Example <span class="delete">16</span><span class="insert">17</span><sup><a class="internalDFN" href="#anexample-entity"><span class="diamond"> ◊</span></a></sup></div>
@@ -3703,7 +3704,11 @@
name</a>.
</p>
-</div>
+<p><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a><span class="insert">, </span><a href="#concept-activity" class="internalDFN"><span class="insert">Activity</span></a><span class="insert">, and </span><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a><span class="insert"> have a mandatory identifier. Two entities (resp. activities, agents) are equal if they have the same identifier.</span></p>
+
+<p><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a><span class="insert">, </span><a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a><span class="insert">, </span><a href="#concept-communication" class="internalDFN"><span class="insert">Communication</span></a><span class="insert">, </span><a href="#concept-start" class="internalDFN"><span class="insert">Start</span></a><span class="insert">, </span><a href="#concept-end" class="internalDFN"><span class="insert">End</span></a><span class="insert">, </span><a href="#concept-invalidation" class="internalDFN"><span class="insert">Invalidation</span></a><span class="insert">, </span><a href="#concept-derivation" class="internalDFN"><span class="insert">Derivation</span></a><span class="insert">, </span><a href="#concept-attribution" class="internalDFN"><span class="insert">Attribution</span></a><span class="insert">, </span><a href="#concept-activityAssociation" class="internalDFN"><span class="insert">Association</span></a><span class="insert">, </span><a href="#concept-delegation" class="internalDFN"><span class="insert">Delegation</span></a><span class="insert">, </span><a href="#concept-influence" class="internalDFN"><span class="insert">Influence</span></a><span class="insert"> have an optional identifier. Two generations (resp. usages, communications, etc.) are equal if they have the same identifier.
+
+</span></p></div>
<div id="term-attribute" class="section">
<h4><span class="secno">5.7.2 </span>Attribute</h4>
@@ -4359,6 +4364,7 @@
</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/502"><span class="insert">ISSUE-502</span></a><span class="insert">: Added sentence in section 2.1.2 explaining that the focus
of derivation is on connecting a generated entity to a used entity.
</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/526"><span class="insert">ISSUE-526</span></a><span class="insert">: Added sentence clarifying sentence in section 5.5.2.
+</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/462"><span class="insert">ISSUE-462</span></a><span class="insert">: Added clarification regarding entity attributes (with respect to fixed aspects) and role of identifier with respect to equality.
</span></li></ul>
</div>
--- a/model/prov-dm.html Mon Oct 29 22:40:24 2012 -0700
+++ b/model/prov-dm.html Tue Oct 30 10:07:50 2012 +0000
@@ -1717,7 +1717,7 @@
<p><div class="attributes" id="attributes-entity">An <dfn title="dfn-Entity" id="dfn-entity">entity</dfn><span class="withPn">, written <span class="pnExpression" id="pn-entity">entity(id, [attr1=val1, ...])</span> in PROV-N, </span> has:
<ul>
<li><span class='attribute' id="entity.id">id</span>: an identifier for an entity; </li>
-<li><span class='attribute' id="entity.attributes">attributes</span>: an OPTIONAL set of attribute-value pairs ((<span class="name">attr1</span>, <span class="name">val1</span>), ...) representing additional information about this entity.</li>
+<li><span class='attribute' id="entity.attributes">attributes</span>: an OPTIONAL set of attribute-value pairs ((<span class="name">attr1</span>, <span class="name">val1</span>), ...) representing additional information about the fixed aspects of this entity.</li>
</ul></div>
<div class="anexample" id="anexample-entity">
@@ -3183,6 +3183,10 @@
name</a>.
</p>
+<p><a>Entity</a>, <a>Activity</a>, and <a>Agent</a> have a mandatory identifier. Two entities (resp. activities, agents) are equal if they have the same identifier.</p>
+
+<p><a>Generation</a>, <a>Usage</a>, <a>Communication</a>, <a>Start</a>, <a>End</a>, <a>Invalidation</a>, <a>Derivation</a>, <a>Attribution</a>, <a>Association</a>, <a>Delegation</a>, <a>Influence</a> have an optional identifier. Two generations (resp. usages, communications, etc.) are equal if they have the same identifier.
+
</section>
<section id="term-attribute">
@@ -3925,6 +3929,7 @@
<li> <a href="http://www.w3.org/2011/prov/track/issues/502">ISSUE-502</a>: Added sentence in section 2.1.2 explaining that the focus
of derivation is on connecting a generated entity to a used entity.
<li> <a href="http://www.w3.org/2011/prov/track/issues/526">ISSUE-526</a>: Added sentence clarifying sentence in section 5.5.2.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/462">ISSUE-462</a>: Added clarification regarding entity attributes (with respect to fixed aspects) and role of identifier with respect to equality.
</ul>
</section>