--- a/model/diff.html Wed May 23 21:57:14 2012 +0100
+++ b/model/diff.html Wed May 23 22:29:00 2012 +0100
@@ -1,4 +1,3 @@
-
<!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"><!--
@@ -1153,7 +1152,7 @@
<div style="text-align: center; ">
<figure style="max-width: 70%; ">
-<img src="uml/essentials.svg" alt="PROV Core Structures" style="max-width: 70%; ">
+<img src="uml/essentials.png" alt="PROV Core Structures" style="max-width: 70%; ">
<figcaption id="prov-core-structures"><span class="insert">Figure 1: PROV Core Structures</span></figcaption>
</figure>
</div>
@@ -2040,7 +2039,7 @@
<table border="1" style="margin-left: auto; margin-right: auto;">
<caption id="relations-at-a-glance">Table 3: PROV-DM Relations At a Glance</caption>
<tbody><tr><td></td><td>Entity</td><td>Activity</td><td>Agent</td><span class="delete">Note</span></tr>
-<tr><td>Entity</td><td><div class="component3-color"><a class="essential internalDFN" href="#dfn-wasderivedfrom">wasDerivedFrom</a><br><a href="#dfn-wasrevisionof" class="internalDFN">wasRevisionOf</a><br><a href="#dfn-wasquotedfrom" class="internalDFN">wasQuotedFrom</a><br><a href="#dfn-hadoriginalsource" class="internalDFN">hadOriginalSource</a></div><div class="component4-color"><a href="#dfn-alternateof" class="internalDFN">alternateOf</a><br><a href="#dfn-specializationof" class="internalDFN">specializationOf</a></div></td><td class="component1-color"><a class="essential internalDFN" title="wasGeneratedBy" href="#dfn-wasgeneratedby">wasGeneratedBy</a><br><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasattributedto">wasAttributedTo<span class="delete">hasAnnotation</span></a></td></tr>
+<tr><td>Entity</td><td><div class="component3-color"><a class="essential internalDFN" href="#dfn-wasderivedfrom">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a href="#dfn-alternateof" class="internalDFN">alternateOf</a><br><a href="#dfn-specializationof" class="internalDFN">specializationOf</a></div></td><td class="component1-color"><a class="essential internalDFN" title="wasGeneratedBy" href="#dfn-wasgeneratedby">wasGeneratedBy</a><br><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasattributedto">wasAttributedTo<span class="delete">hasAnnotation</span></a></td></tr>
<tr><td>Activity</td><td><div class="component1-color"><a class="essential internalDFN" href="#dfn-used">used</a><br><a href="#dfn-wasstartedby" class="internalDFN">wasStartedBy</a><br><a href="#dfn-wasendedby" class="internalDFN">wasEndedBy</a></div></td><td class="component1-color"><span class="delete">wasStartedByActivity</span><a href="#dfn-wasinformedby" class="internalDFN">wasInformedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasassociatedwith">wasAssociatedWith<span class="delete">hasAnnotation</span></a></td></tr>
<tr><td>Agent</td><td>—</td><td>—</td><td class="component2-color"><a class="essential internalDFN" href="#dfn-actedonbehalfof">actedOnBehalfOf<span class="delete">hasAnnotation</span>
<span class="delete">Note</span><span class="delete">—</span><span class="delete">—</span><span class="delete">—</span><span class="delete">hasAnnotation</span></a></td></tr>
@@ -2054,7 +2053,7 @@
<table border="1" style="margin-left: auto; margin-right: auto;">
<caption id="prov-dm-types-and-relations">Table 4: PROV-DM Types and Relations</caption>
<tbody><tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b><span class="insert">Component</span></b></td></tr>
-<tr class="component1-color"><td class="essential"><a href="#concept-entity" class="internalDFN">Entity</a></td><td><a title="dfn-Entity" class="essential internalDFN" href="#dfn-entity">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><span class="insert">Component 1: entities/activities</span></td></tr>
+<tr class="component1-color"><td class="essential"><a href="#concept-entity" class="internalDFN">Entity</a></td><td><a title="dfn-Entity" class="essential internalDFN" href="#dfn-entity">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1"><span class="insert">Component 1: entities/activities</span></a></td></tr>
<tr class="component1-color"><td class="essential"><a href="#concept-activity" class="internalDFN">Activity</a></td><td><a title="dfn-Activity" class="essential internalDFN" href="#dfn-activity">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
<tr class="component1-color"><td class="essential"><a href="#concept-generation" class="internalDFN">Generation</a></td><td><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN"><span class="delete">wasGeneratedBy(id,e,a,t,attrs)</span><span class="essential"><span class="insert">wasGeneratedBy(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">e,a</span></span><span class="insert">,t,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
<tr class="component1-color"><td class="essential"><a href="#concept-usage" class="internalDFN">Usage</a></td><td><a title="used" href="#dfn-used" class="internalDFN"><span class="delete">used(id,a,e,t,attrs)</span><span class="essential"><span class="insert">used(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">a,e</span></span><span class="insert">,t,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
@@ -2062,23 +2061,28 @@
<tr class="component1-color"><td><a href="#concept-end" class="internalDFN">End</a></td><td><a title="wasEndedBy" href="#dfn-wasendedby" class="internalDFN"><span class="delete">wasEndedBy(id,a,e,t,attrs)</span><span class="insert">wasEndedBy(id;a2,e,a1,t,attrs)</span></a></td></tr>
<tr class="component1-color"><td><a href="#concept-invalidation" class="internalDFN">Invalidation</a></td><td><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN"><span class="delete">wasInvalidatedBy(id,e,a,t,attrs)</span><span class="insert">wasInvalidatedBy(id;e,a,t,attrs)</span></a></td></tr>
<tr class="component1-color"><td><a href="#concept-communication" class="internalDFN">Communication</a></td><td><a title="wasInformedBy" href="#dfn-wasinformedby" class="internalDFN"><span class="delete">wasInformedBy(id,a2,a1,attrs)</span><span class="insert">wasInformedBy(id;a2,a1,attrs)</span></a></td></tr>
-<span class="delete">Start by Activity</span><tr class="component2-color"><td class="essential"><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span><a title="dfn-agent" class="essential internalDFN" href="#dfn-agent"><span class="insert">agent(id, [ attr1=val1, ...])</span></a></td><td rowspan="4"><span class="insert">Component 2: agents/responsibility</span></td></tr>
+<span class="delete">Start by Activity</span><tr class="component2-color"><td class="essential"><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span><a title="dfn-agent" class="essential internalDFN" href="#dfn-agent"><span class="insert">agent(id, [ attr1=val1, ...])</span></a></td><td rowspan="8"><a href="#component2"><span class="insert">Component 2: agents/responsibility</span></a></td></tr>
<tr class="component2-color"><span class="delete">Agent</span><span class="delete">agent(id, [ attr1=val1, ...])</span>
<td class="essential"><a href="#concept-attribution" class="internalDFN">Attribution</a></td><td><a title="wasAttributedTo" href="#dfn-wasattributedto" class="internalDFN"><span class="delete">wasAttributedTo(id,e,ag,attr)</span><span class="essential"><span class="insert">wasAttributedTo(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">e,ag</span></span><span class="insert">,attr</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
<tr class="component2-color"><td class="essential"><a href="#concept-association-core" class="internalDFN">Association</a></td><td><a title="wasAssociatedWith" href="#dfn-wasassociatedwith" class="internalDFN"><span class="delete">wasAssociatedWith(id,a,ag,pl,attrs)</span><span class="essential"><span class="insert">wasAssociatedWith(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">a,ag</span></span><span class="insert">,pl,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
<tr class="component2-color"><td class="essential"><a href="#concept-responsibility" class="internalDFN">Responsibility</a></td><td><a title="actedOnBehalfOf" href="#dfn-actedonbehalfof" class="internalDFN"><span class="delete">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span><span class="essential"><span class="insert">actedOnBehalfOf(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">ag2,ag1</span></span><span class="insert">,a,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
-<tr class="component3-color"><td class="essential"><a href="#concept-derivation" class="internalDFN">Derivation</a></td><td><a title="wasDerivedFrom" href="#dfn-wasderivedfrom" class="internalDFN"><span class="delete">wasDerivedFrom(id, </span><span class="essential"><span class="insert">wasDerivedFrom(</span></span><span class="insert">id; </span><span class="essential">e2, <span class="delete">e1,</span><span class="insert">e1</span></span><span class="insert">,</span> a, g2, u1, <span class="delete">attrs)</span><span class="insert">attrs</span><span class="essential"><span class="insert">)</span></span></a></td><td rowspan="5"><span class="insert">Component 3: derivation</span></td></tr>
-<tr class="component3-color"><td><a href="#concept-revision" class="internalDFN">Revision</a></td><td><a title="wasRevisionOf" href="#dfn-wasrevisionof" class="internalDFN"><span class="delete">wasRevisionOf(id,e2,e1,ag,attrs)</span><span class="insert">wasRevisionOf(id; e2, e1, a, g2, u1, attrs)</span></a></td></tr>
-<tr class="component3-color"><td><a href="#concept-quotation" class="internalDFN">Quotation</a></td><td><a title="wasQuotedFrom" href="#dfn-wasquotedfrom" class="internalDFN"><span class="delete">wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</span><span class="insert">wasQuotedFrom(id; e2, e1, a, g2, u1, attrs)</span></a></td></tr>
-<tr class="component3-color"><td><a href="#concept-original-source" class="internalDFN">Original Source</a></td><td><a title="hadOriginalSource" href="#dfn-hadoriginalsource" class="internalDFN"><span class="delete">hadOriginalSource(id,e2,e1,attrs)</span><span class="insert">hadOriginalSource(id; e2, e1, a, g2, u1, attrs)</span></a></td></tr>
+<tr class="component2-color"><td class="provType"><a href="#concept-plan" class="internalDFN"><span class="insert">Plan</span></a></td><td><a title="plan" href="#concept-plan" class="internalDFN"><span class="insert">... prov:type='prov:Plan' ...</span></a></td>
+</tr><tr class="component2-color"><td class="provType"><a href="#concept-person" class="internalDFN"><span class="insert">Person</span></a></td><td><a title="person" href="#concept-person" class="internalDFN"><span class="insert">... prov:type='prov:Person' ...</span></a></td>
+</tr><tr class="component2-color"><td class="provType"><a href="#concept-organization" class="internalDFN"><span class="insert">Organization</span></a></td><td><a title="organization" href="#concept-organization" class="internalDFN"><span class="insert">... prov:type='prov:Organization' ...</span></a></td>
+</tr><tr class="component2-color"><td class="provType"><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">SoftwareAgent</span></a></td><td><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">... prov:type='prov:SoftwareAgent' ...</span></a></td>
+</tr><tr class="component3-color"><td class="essential"><a href="#concept-derivation" class="internalDFN">Derivation</a></td><td><a title="wasDerivedFrom" href="#dfn-wasderivedfrom" class="internalDFN"><span class="delete">wasDerivedFrom(id, </span><span class="essential"><span class="insert">wasDerivedFrom(</span></span><span class="insert">id; </span><span class="essential">e2, <span class="delete">e1,</span><span class="insert">e1</span></span><span class="insert">,</span> a, g2, u1, <span class="delete">attrs)</span><span class="insert">attrs</span><span class="essential"><span class="insert">)</span></span></a></td><td rowspan="5"><a href="#component3"><span class="insert">Component 3: derivation</span></a></td></tr>
+<tr class="component3-color"><td class="provType"><a href="#concept-revision" class="internalDFN">Revision</a></td><td><span class="delete">wasRevisionOf(id,e2,e1,ag,attrs)</span><a title="revision" href="#concept-revision" class="internalDFN"><span class="insert">... prov:type='prov:WasRevisionOf' ...</span></a></td></tr>
+<tr class="component3-color"><td class="provType"><a href="#concept-quotation" class="internalDFN">Quotation</a></td><td><span class="delete">wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</span><a title="quotation" href="#concept-quotation" class="internalDFN"><span class="insert">... prov:type='prov:WasQuotedFrom' ...</span></a></td></tr>
+<tr class="component3-color"><td class="provType"><a href="#concept-original-source" class="internalDFN">Original Source</a></td><td><span class="delete">hadOriginalSource(id,e2,e1,attrs)</span><a title="Original Source" href="#concept-original-source" class="internalDFN"><span class="insert">... prov:type='prov:HadOriginalSource' ...</span></a></td></tr>
<tr class="component3-color"><td><a href="#concept-trace" class="internalDFN">Trace</a></td><td><a title="tracedTo" href="#dfn-tracedto" class="internalDFN"><span class="delete">tracedTo(id,e2,e1,attrs)</span><span class="insert">tracedTo(id;e2,e1,attrs)</span></a></td></tr>
-<tr class="component4-color"><td><a href="#concept-alternate" class="internalDFN">Alternate</a></td><td><a title="alternateOf" href="#dfn-alternateof" class="internalDFN">alternateOf(alt1, alt2)</a></td><td rowspan="2"><span class="insert">Component 4: alternate</span></td></tr>
+<tr class="component4-color"><td><a href="#concept-alternate" class="internalDFN">Alternate</a></td><td><a title="alternateOf" href="#dfn-alternateof" class="internalDFN">alternateOf(alt1, alt2)</a></td><td rowspan="2"><a href="#component4"><span class="insert">Component 4: alternate</span></a></td></tr>
<tr class="component4-color"><td><a href="#concept-specialization" class="internalDFN">Specialization</a></td><td><a title="specializationOf" href="#dfn-specializationof" class="internalDFN">specializationOf(sub, super)</a></td></tr>
-<tr class="component6-color"><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle constructor</span></a></td><td><a title="dfn-bundle" href="#dfn-bundle-declaration" class="internalDFN"><span class="insert">bundle id description_1 ... description_n endBundle</span></a></td><td rowspan="3"><span class="insert">Component 5: bundles</span></td></tr>
-<tr class="component6-color"><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle description</span></a></td><td><a href="#concept-bundle" class="internalDFN"><span class="insert">Bundle</span></a></td></tr>
+<tr class="component6-color"><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle constructor</span></a></td><td><a title="dfn-bundle" href="#dfn-bundle-declaration" class="internalDFN"><span class="insert">bundle id description_1 ... description_n endBundle</span></a></td><td rowspan="3"><a href="#component5"><span class="insert">Component 5: bundles</span></a></td></tr>
+<tr class="component6-color"><td class="provType"><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle description</span></a></td><td><a><span class="insert">... prov:type='prov:Bundle' ...</span></a></td></tr>
<tr class="component6-color"><td><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a></td><td><a title="hasProvenanceIn" href="#dfn-hasprovenancein" class="internalDFN"><span class="insert">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span></a></td></tr>
-<tr class="component5-color"><td><a href="#concept-collection" class="internalDFN">Collection</a></td><td><a href="#concept-collection" class="internalDFN">Collection</a></td><td rowspan="5"><span class="insert">Component 6: Collections</span></td></tr>
-<tr class="component5-color"><td><a href="#concept-dictionary" class="internalDFN">Dictionary</a></td><td><a href="#concept-dictionary" class="internalDFN">Dictionary</a></td></tr>
+<tr class="component5-color"><td class="provType"><a href="#concept-collection" class="internalDFN">Collection</a></td><td><span class="delete">Collection</span><a title="collection" href="#concept-collection" class="internalDFN"><span class="insert">... prov:type='prov:Collection' ...</span></a></td><td rowspan="6"><a href="#component6"><span class="insert">Component 6: Collections</span></a></td></tr>
+<tr class="component5-color"><td class="provType"><a href="#concept-dictionary" class="internalDFN">Dictionary</a></td><td><span class="delete">Dictionary</span><a title="dictionary" href="#concept-dictionary" class="internalDFN"><span class="insert">... prov:type='prov:Dictionary' ...</span></a></td></tr>
+<tr class="component5-color"><td class="provType"><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">EmptyCollection</span></a></td><td><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">... prov:type='prov:EmptyCollection' ...</span></a></td></tr>
<tr class="component5-color"><td><a href="#concept-insertion" class="internalDFN">Insertion</a></td><td><a title="derivedByInsertionFrom" href="#dfn-derivedbyinsertionfrom" class="internalDFN"><span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
<tr class="component5-color"><td><a href="#concept-removal" class="internalDFN">Removal</a></td><td><a title="derivedByRemovalFrom" href="#dfn-derivedbyremovalfrom" class="internalDFN"><span class="delete">derivedByRemovalFrom(id,</span><span class="insert">derivedByRemovalFrom(id;</span> c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
<tr class="component5-color"><td><a href="#concept-membership" class="internalDFN">Membership</a></td><td><a title="memberOf" href="#dfn-memberof" class="internalDFN">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})
@@ -2106,7 +2110,7 @@
<figure>
-<img src="uml/component1.svg" alt="entities and activities">
+<img src="uml/component1.png" alt="entities and activities">
<figcaption id="figure-component1">Figure 5: Entities and Activities Component Overview
</figcaption>
</figure>
@@ -2542,7 +2546,7 @@
<figure>
-<img src="uml/component2.svg" alt="agents and responsibilities">
+<img src="uml/component2.png" alt="agents and responsibilities">
<figcaption id="figure-component2">Figure 6: Agents and Responsibilities Component Overview
</figcaption>
</figure>
@@ -2748,7 +2752,7 @@
<figure>
-<img src="uml/component3.svg" alt="derivation">
+<img src="uml/component3.png" alt="derivation">
<figcaption id="figure-component3">Figure 7: Derivation Component Overview
</figcaption>
</figure>
@@ -2816,17 +2820,19 @@
The agent who is responsible for the revision may optionally be specified.
</span>Revision is a particular case of <a href="#concept-derivation" class="internalDFN">derivation</a> of an entity into its revised version.</p>
-<p> A <dfn title="wasRevisionOf" id="dfn-wasrevisionof">revision</dfn> relation<span class="withPn">, written <span class="pnExpression"><span class="delete">wasRevisionOf(id,e2,e1,ag,attrs)</span><span class="insert">wasRevisionOf(id; e2, e1, a, g2, u1, attrs)</span></span> in PROV-N,</span> has:</p>
-<ul>
-<li><span class="attribute" id="revision.id">id</span>: an <em class="rfc2119" title="optional">optional</em> identifier for the relation;</li>
-<li><span class="attribute" id="revision.newer">newer</span>: the identifier (<span class="name">e2</span>) of the revised entity;
-</li><li><span class="attribute" id="revision.older">older</span>: the identifier (<span class="name">e1</span>) of the older entity;
-</li><li><span class="delete">responsibility</span><span class="attribute" id="revision.activity"><span class="insert">activity</span></span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name"><span class="delete">ag</span><span class="insert">a</span></span>) for the <span class="delete">agent who approved the newer</span><span class="insert">activity using and generating the above entities;</span></li>
-<li><span class="attribute" id="revision.generation"><span class="insert">generation</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">g2</span></span><span class="insert">) for the generation involving the generated</span> entity <span class="delete">as a variant of the older;
-</span><span class="insert">(</span><span class="name"><span class="insert">e2</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="revision.usage"><span class="insert">usage</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">u1</span></span><span class="insert">) for the usage involving the used entity (</span><span class="name"><span class="insert">e1</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="revision.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
-</ul>
+<span class="delete"> A </span><span class="delete">revision</span><span class="delete"> relation</span><span class="delete">, written </span><span class="delete">wasRevisionOf(id,e2,e1,ag,attrs)</span><span class="delete"> in PROV-N,</span><span class="delete"> has:</span>
+
+<span class="delete">id</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier for the relation;</span>
+<span class="delete">newer</span><span class="delete">: the identifier (</span><span class="delete">e2</span><span class="delete">) of the revised entity;
+</span><span class="delete">older</span><span class="delete">: the identifier (</span><span class="delete">e1</span><span class="delete">) of the older entity;
+</span><span class="delete">responsibility</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier (</span><span class="delete">ag</span><span class="delete">) for the agent who approved the newer entity as a variant of the older;
+</span><span class="delete">attributes</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> set (</span><span class="delete">attrs</span><span class="delete">) of attribute-value pairs representing additional information about this relation.</span>
+
+
+
+
+
+
@@ -2839,7 +2845,7 @@
agent </span><span class="delete">w3:Consortium</span></span>.
</p><pre class="codeexample">entity(tr:WD-prov-dm-20111215, [ <span class="delete">prov:type="process:RecsWD" %% xsd:QName </span><span class="insert">prov:type='rec54:WD' </span>])
entity(tr:WD-prov-dm-20111018, [ <span class="delete">prov:type="process:RecsWD" %% xsd:QName </span><span class="insert">prov:type='rec54:WD' </span>])
-wasRevisionOf(tr:WD-prov-dm-20111215, <span class="delete">tr:WD-prov-dm-20111018, w3:Consortium)</span><span class="insert">tr:WD-prov-dm-20111018)</span>
+<span class="delete">wasRevisionOf(tr:WD-prov-dm-20111215,</span><span class="insert">wasDerivedFrom(tr:WD-prov-dm-20111215,</span> tr:WD-prov-dm-20111018, <span class="delete">w3:Consortium)</span><span class="insert">[ prov:type='prov:WasRevisionOf' ])</span>
</pre>
</div>
@@ -2854,21 +2860,22 @@
<span class="glossary-ref"> A <dfn id="concept-quotation">quotation</dfn> is the repeat of (some or all of) an entity, such as text or image, by someone <span class="delete">other than</span><span class="insert">who may or may not be</span> its original author. </span>
</p>
-<p>Quotation
- is a particular case of <a href="#concept-derivation" class="internalDFN">derivation</a> in which entity <span class="name">e2</span> is derived from an original entity <span class="name">e1</span> by copying, or "quoting", some or all of it.
- A <dfn title="wasQuotedFrom" id="dfn-wasquotedfrom">quotation</dfn> relation<span class="withPn">, written <span class="pnExpression"><span class="delete">wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</span><span class="insert">wasQuotedFrom(id; e2, e1, a, g2, u1, attrs)</span></span> in PROV-N,</span> has:</p>
-<ul>
-<li><span class="attribute" id="quotation.id">id</span>: an <em class="rfc2119" title="optional">optional</em> identifier for the relation;</li>
-<li><span class="attribute" id="quotation.quote">quote</span>: an identifier (<span class="name">e2</span>) for the entity that represents the quote (the partial copy);
-</li><li><span class="attribute" id="quotation.original">original</span>: an identifier (<span class="name">e1</span>) for the original entity being quoted;
-</li><li><span class="delete">quoterAgent</span><span class="attribute" id="quotation.activity"><span class="insert">activity</span></span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name"><span class="delete">ag2</span><span class="insert">a</span></span>) for the <span class="delete">agent who performs the quote;
-</span><span class="insert">activity using and generating the above entities;</span></li>
-<li><span class="delete">originalAgent</span><span class="attribute" id="quotation.generation"><span class="insert">generation</span></span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name"><span class="delete">ag1</span><span class="insert">g2</span></span>) for the <span class="delete">agent to whom the original</span><span class="insert">generation involving the generated</span> entity <span class="delete">is attributed;
-</span><span class="insert">(</span><span class="name"><span class="insert">e2</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="quotation.usage"><span class="insert">usage</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">u1</span></span><span class="insert">) for the usage involving the used entity (</span><span class="name"><span class="insert">e1</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="quotation.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
-
-</ul>
+<span class="delete">Quotation
+ is a particular case of </span><span class="delete">derivation</span><span class="delete"> in which entity </span><span class="delete">e2</span><span class="delete"> is derived from an original entity </span><span class="delete">e1</span><span class="delete"> by copying, or "quoting", some or all of it.
+ A </span><span class="delete">quotation</span><span class="delete"> relation</span><span class="delete">, written </span><span class="delete">wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</span><span class="delete"> in PROV-N,</span><span class="delete"> has:</span>
+
+<span class="delete">id</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier for the relation;</span>
+<span class="delete">quote</span><span class="delete">: an identifier (</span><span class="delete">e2</span><span class="delete">) for the entity that represents the quote (the partial copy);
+</span><span class="delete">original</span><span class="delete">: an identifier (</span><span class="delete">e1</span><span class="delete">) for the original entity being quoted;
+</span><span class="delete">quoterAgent</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier (</span><span class="delete">ag2</span><span class="delete">) for the agent who performs the quote;
+</span><span class="delete">originalAgent</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier (</span><span class="delete">ag1</span><span class="delete">) for the agent to whom the original entity is attributed;
+</span><span class="delete">attributes</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> set (</span><span class="delete">attrs</span><span class="delete">) of attribute-value pairs representing additional information about this relation.</span>
+
+
+
+
+
+
<div class="anexample" id="anexample-quotation">
<p>
@@ -2881,7 +2888,9 @@
<pre class="codeexample">entity(wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/)
agent(ex:Luc)
agent(ex:Paul)
-<span class="delete">wasQuotedFrom(dm:bl-dagstuhl,wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/,ex:Luc,ex:Paul)</span><span class="insert">wasQuotedFrom(dm:bl-dagstuhl,wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/)
+<span class="delete">wasQuotedFrom(dm:bl-dagstuhl,wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/,ex:Luc,ex:Paul)</span><span class="insert">wasDerivedFrom(dm:bl-dagstuhl,
+ wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/,
+ [ prov:type='prov:WasQuotedFrom' ])
wasAttributedTo(dm:bl-dagstuhl, ex:Luc)
wasAttributedTo(wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/, ex:Paul)</span>
</pre>
@@ -2907,16 +2916,13 @@
<a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html">http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html</a>.</p>
-<p> An <dfn title="hadOriginalSource" id="dfn-hadoriginalsource">original source</dfn> relation<span class="withPn">, written <span class="pnExpression"><span class="delete">hadOriginalSource(id,e2,e1,attrs)</span><span class="insert">hadOriginalSource(id; e2, e1, a, g2, u1, attrs)</span></span>,</span> has:</p>
-<ul>
-<li><span class="attribute" id="originalSource.id">id</span>: an <em class="rfc2119" title="optional">optional</em> identifier for the relation;</li>
-<li><span class="attribute" id="originalSource.derived">derived</span>: an identifier (<span class="name">e2</span>) for the derived entity; </li>
-<li><span class="attribute" id="originalSource.source">source</span>: an identifier (<span class="name">e1</span>) for the original source entity;</li>
-<li><span class="attribute" id="originalSource.activity"><span class="insert">activity</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">a</span></span><span class="insert">) for the activity using and generating the above entities;</span></li>
-<li><span class="attribute" id="originalSource.generation"><span class="insert">generation</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">g2</span></span><span class="insert">) for the generation involving the generated entity (</span><span class="name"><span class="insert">e2</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="originalSource.usage"><span class="insert">usage</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">u1</span></span><span class="insert">) for the usage involving the used entity (</span><span class="name"><span class="insert">e1</span></span><span class="insert">) and activity;</span></li>
-<li><span class="attribute" id="originalSource.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
-</ul>
+<span class="delete"> An </span><span class="delete">original source</span><span class="delete"> relation</span><span class="delete">, written </span><span class="delete">hadOriginalSource(id,e2,e1,attrs)</span><span class="delete">,</span><span class="delete"> has:</span>
+
+<span class="delete">id</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> identifier for the relation;</span>
+<span class="delete">derived</span><span class="delete">: an identifier (</span><span class="delete">e2</span><span class="delete">) for the derived entity; </span>
+<span class="delete">source</span><span class="delete">: an identifier (</span><span class="delete">e1</span><span class="delete">) for the original source entity;</span>
+<span class="delete">attributes</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> set (</span><span class="delete">attrs</span><span class="delete">) of attribute-value pairs representing additional information about this relation.</span>
+
<div class="anexample">
<p>
@@ -2924,7 +2930,8 @@
the Google page <a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html"><span class="name">go:credit-where-credit-is-due.html</span></a>, where the notion original-source was originally described (to the knowledge of the authors).
</p><pre class="codeexample">entity(dm:concept-original-source)
entity(go:credit-where-credit-is-due.html)
-hadOriginalSource(dm:concept-original-source,go:credit-where-credit-is-due.html)
+<span class="delete">hadOriginalSource(dm:concept-original-source,go:credit-where-credit-is-due.html)</span><span class="insert">wasDerivedFrom(dm:concept-original-source,go:credit-where-credit-is-due.html,
+ [ prov:type='prov:HadOriginalSource' ])</span>
</pre>
</div>
@@ -2991,7 +2998,7 @@
<figure>
-<img src="uml/component4.svg" alt="alternates">
+<img src="uml/component4.png" alt="alternates">
<figcaption id="figure-component4">Figure 8: Alternates Component Overview
</figcaption>
</figure>
@@ -3110,7 +3117,7 @@
<div style="text-align: center;">
<figure>
-<img src="uml/component5.svg" alt="bundles">
+<img src="uml/component5.png" alt="bundles">
<figcaption id="figure-component5"><span class="insert">Figure 9: Bundle Component Overview</span></figcaption>
</figure>
</div>
@@ -3406,7 +3413,7 @@
<figure>
-<img src="uml/component6.svg" alt="dictionaries">
+<img src="uml/component6.png" alt="dictionaries">
<figcaption id="figure-component6">Figure <span class="delete">9:</span><span class="insert">10:</span> Collections Component Overview
</figcaption>
@@ -3916,9 +3923,9 @@
<p>The following types are pre-defined in PROV, and are valid values for the <span class="name">prov:type</span> attribute.</p>
<ul>
-<li><span class="name">prov:Plan</span></li>
-
-<li><span class="name">prov:Account</span></li>
+<li><span class="name">prov:Plan
+
+<span class="delete">prov:Account</span></span></li>
<li><span class="name">prov:SoftwareAgent</span></li>
@@ -3926,6 +3933,8 @@
<li><span class="name">prov:Person</span></li>
+<li><span class="name"><span class="insert">prov:Bundle</span></span></li>
+
<li><span class="name">prov:Collection</span></li>
<li><span class="name">prov:Dictionary</span></li>
--- a/model/prov-dm.html Wed May 23 21:57:14 2012 +0100
+++ b/model/prov-dm.html Wed May 23 22:29:00 2012 +0100
@@ -1164,7 +1164,7 @@
<table border="1" style="margin-left: auto; margin-right: auto;">
<caption id="prov-dm-types-and-relations">Table 4: PROV-DM Types and Relations</caption>
<tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b>Component</b></td></tr>
-<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a title="dfn-Entity" class="essential">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8">Component 1: entities/activities</td></tr>
+<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a title="dfn-Entity" class="essential">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1">Component 1: entities/activities</a></td></tr>
<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a title="dfn-Activity" class="essential">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
<tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a title="wasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a></td></tr>
<tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a title="used"><span class="essential">used(</span>id;<span class="essential">a,e</span>,t,attrs<span class="essential">)</span></a></td></tr>
@@ -1172,22 +1172,27 @@
<tr class="component1-color"><td><a>End</a></td><td><a title="wasEndedBy">wasEndedBy(id;a2,e,a1,t,attrs)</a></td></tr>
<tr class="component1-color"><td><a>Invalidation</a></td><td><a title="wasInvalidatedBy">wasInvalidatedBy(id;e,a,t,attrs)</a></td></tr>
<tr class="component1-color"><td><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy(id;a2,a1,attrs)</a></td></tr>
-<tr class="component2-color"><td class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td rowspan="4">Component 2: agents/responsibility</td></tr>
+<tr class="component2-color"><td class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component2">Component 2: agents/responsibility</a></td></tr>
<tr class="component2-color"><td class="essential"><a>Attribution</a></td><td><a title="wasAttributedTo"><span class="essential">wasAttributedTo(</span>id;<span class="essential">e,ag</span>,attr<span class="essential">)</span></a></td></tr>
<tr class="component2-color"><td class="essential"><a>Association</a></td><td><a title="wasAssociatedWith"><span class="essential">wasAssociatedWith(</span>id;<span class="essential">a,ag</span>,pl,attrs<span class="essential">)</span></a></td></tr>
<tr class="component2-color"><td class="essential"><a>Responsibility</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
-<tr class="component3-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td rowspan="5">Component 3: derivation</td></tr>
-<tr class="component3-color"><td><a>Revision</a></td><td><a title="wasRevisionOf">wasRevisionOf(id; e2, e1, a, g2, u1, attrs)</a></td></tr>
-<tr class="component3-color"><td><a>Quotation</a></td><td><a title="wasQuotedFrom">wasQuotedFrom(id; e2, e1, a, g2, u1, attrs)</a></td></tr>
-<tr class="component3-color"><td><a>Original Source</a></td><td><a title="hadOriginalSource">hadOriginalSource(id; e2, e1, a, g2, u1, attrs)</a></td></tr>
+<tr class="component2-color"><td class="provType"><a>Plan</a></td><td><a title="plan">... prov:type='prov:Plan' ...</a></td>
+<tr class="component2-color"><td class="provType"><a>Person</a></td><td><a title="person">... prov:type='prov:Person' ...</a></td>
+<tr class="component2-color"><td class="provType"><a>Organization</a></td><td><a title="organization">... prov:type='prov:Organization' ...</a></td>
+<tr class="component2-color"><td class="provType"><a title="software-agent">SoftwareAgent</a></td><td><a title="software-agent">... prov:type='prov:SoftwareAgent' ...</a></td>
+<tr class="component3-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td rowspan="5"><a href="#component3">Component 3: derivation</a></td></tr>
+<tr class="component3-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
+<tr class="component3-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></a></td></tr>
+<tr class="component3-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
<tr class="component3-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
-<tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td rowspan="2">Component 4: alternate</td></tr>
+<tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td rowspan="2"><a href="#component4">Component 4: alternate</a></td></tr>
<tr class="component4-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super)</a></td></tr>
-<tr class="component6-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td rowspan="3">Component 5: bundles</td></tr>
-<tr class="component6-color"><td><a title="bundle">Bundle description</a></td><td><a>Bundle</a></td></tr>
+<tr class="component6-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td rowspan="3"><a href="#component5">Component 5: bundles</a></td></tr>
+<tr class="component6-color"><td class="provType"><a title="bundle">Bundle description</a></td><td><a>... prov:type='prov:Bundle' ...</a></td></tr>
<tr class="component6-color"><td><a>Provenance Locator</a></td><td><a title="hasProvenanceIn">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</a></td></tr>
-<tr class="component5-color"><td><a>Collection</a></td><td><a>Collection</a></td><td rowspan="5">Component 6: Collections</td></tr>
-<tr class="component5-color"><td><a>Dictionary</a></td><td><a>Dictionary</a></td></tr>
+<tr class="component5-color"><td class="provType"><a>Collection</a></td><td><a title="collection">... prov:type='prov:Collection' ...</a></td><td rowspan="6"><a href="#component6">Component 6: Collections</a></td></tr>
+<tr class="component5-color"><td class="provType"><a>Dictionary</a></td><td><a title="dictionary">... prov:type='prov:Dictionary' ...</a></td></tr>
+<tr class="component5-color"><td class="provType"><a title="empty collection">EmptyCollection</a></td><td><a title="empty collection">... prov:type='prov:EmptyCollection' ...</a></td></tr>
<tr class="component5-color"><td><a>Insertion</a></td><td><a title="derivedByInsertionFrom">derivedByInsertionFrom(id; c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
<tr class="component5-color"><td><a>Removal</a></td><td><a title="derivedByRemovalFrom">derivedByRemovalFrom(id; c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
<tr class="component5-color"><td><a>Membership</a></td><td><a title="memberOf">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</a></td></tr>
@@ -1917,7 +1922,7 @@
<p>Revision is a particular case of <a>derivation</a> of an entity into its revised version.</p>
-<p> A <dfn title="wasRevisionOf">revision</dfn> relation<span class="withPn">, written <span class="pnExpression">wasRevisionOf(id; e2, e1, a, g2, u1, attrs)</span> in PROV-N,</span> has:</p>
+<!-- <p> A <dfn title="wasRevisionOf">revision</dfn> relation<span class="withPn">, written <span class="pnExpression">wasRevisionOf(id; e2, e1, a, g2, u1, attrs)</span> in PROV-N,</span> has:</p>
<ul>
<li><span class='attribute' id="revision.id">id</span>: an OPTIONAL identifier for the relation;</li>
<li><span class='attribute' id="revision.newer">newer</span>: the identifier (<span class="name">e2</span>) of the revised entity;
@@ -1927,7 +1932,7 @@
<li><span class='attribute' id="revision.usage">usage</span>: an OPTIONAL identifier (<span class="name">u1</span>) for the usage involving the used entity (<span class="name">e1</span>) and activity;</li>
<li><span class='attribute' id="revision.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
</ul>
-
+-->
<div class="anexample" id="anexample-revision">
@@ -1939,7 +1944,7 @@
<pre class="codeexample">
entity(tr:WD-prov-dm-20111215, [ prov:type='rec54:WD' ])
entity(tr:WD-prov-dm-20111018, [ prov:type='rec54:WD' ])
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ prov:type='prov:WasRevisionOf' ])
</pre>
</div>
@@ -1954,6 +1959,7 @@
<span class="glossary-ref" data-ref="glossary-quotation"></span>
</p>
+<!--
<p>Quotation
is a particular case of <a>derivation</a> in which entity <span class="name">e2</span> is derived from an original entity <span class="name">e1</span> by copying, or "quoting", some or all of it.
A <dfn title="wasQuotedFrom">quotation</dfn> relation<span class="withPn">, written <span class="pnExpression">wasQuotedFrom(id; e2, e1, a, g2, u1, attrs)</span> in PROV-N,</span> has:</p>
@@ -1967,6 +1973,7 @@
<li><span class='attribute' id="quotation.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
</ul>
+-->
<div class="anexample" id="anexample-quotation">
<p>
@@ -1980,7 +1987,9 @@
entity(wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/)
agent(ex:Luc)
agent(ex:Paul)
-wasQuotedFrom(dm:bl-dagstuhl,wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/)
+wasDerivedFrom(dm:bl-dagstuhl,
+ wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/,
+ [ prov:type='prov:WasQuotedFrom' ])
wasAttributedTo(dm:bl-dagstuhl, ex:Luc)
wasAttributedTo(wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop/, ex:Paul)
</pre>
@@ -2005,7 +2014,7 @@
<span class="name">original-source</span> as defined in
<a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html">http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html</a>.</p>
-
+<!--
<p> An <dfn title="hadOriginalSource">original source</dfn> relation<span class="withPn">, written <span class="pnExpression">hadOriginalSource(id; e2, e1, a, g2, u1, attrs)</span>,</span> has:</p>
<ul>
<li><span class='attribute' id="originalSource.id">id</span>: an OPTIONAL identifier for the relation;</li>
@@ -2016,7 +2025,7 @@
<li><span class='attribute' id="originalSource.usage">usage</span>: an OPTIONAL identifier (<span class="name">u1</span>) for the usage involving the used entity (<span class="name">e1</span>) and activity;</li>
<li><span class='attribute' id="originalSource.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this relation.</li>
</ul>
-
+-->
<div class="anexample">
<p>
Let us consider the concept introduced in the current section, identified as <a href="#concept-original-source"><span class="name">dm:concept-original-source</span></a>, and
@@ -2024,7 +2033,8 @@
<pre class="codeexample">
entity(dm:concept-original-source)
entity(go:credit-where-credit-is-due.html)
-hadOriginalSource(dm:concept-original-source,go:credit-where-credit-is-due.html)
+wasDerivedFrom(dm:concept-original-source,go:credit-where-credit-is-due.html,
+ [ prov:type='prov:HadOriginalSource' ])
</pre>
</div>