--- a/model/working-copy/wd5-prov-dm-components.html Sun Mar 18 14:33:54 2012 +0000
+++ b/model/working-copy/wd5-prov-dm-components.html Sun Mar 18 15:20:25 2012 +0000
@@ -873,6 +873,38 @@
</div>
+<div style="text-align: center;">
+<table border="1" style="margin-left: auto; margin-right: auto;">
+<caption>PROV-DM Concepts and Relations</caption>
+<tr class="component1-color"><td><a title="glossary-entity">Entity</a></td><td><a title="dfn-Entity">entity(id, [ attr1=val1, ...])</a></td></tr>
+<tr class="component1-color"><td>Activity</td><td><a title="dfn-Activity">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
+<tr class="component1-color"><td>Generation</td><td><a title="dfn-Generation">wasGeneratedBy(id,e,a,t,attrs)</a></td></tr>
+<tr class="component1-color"><td>Usage</td><td><a title="used">used(id,a,e,t,attrs)</a></td></tr>
+<tr class="component1-color"><td>Start</td><td><a title="wasStartedBy">wasStartedBy(id,a,e,t,attrs)</a></td></tr>
+<tr class="component1-color"><td>End</td><td><a title="wasEndedBy">wasEndedBy(id,a,e,t,attrs)</a></td></tr>
+<tr class="component1-color"><td>Information flow ordering</td><td><a title="wasInformedBy">wasInformedBy(id,a2,a1,attrs)</a></td></tr>
+<tr class="component1-color"><td>Control flow ordering</td><td><a title="wasStartedByActivity">wasStartedByActivity(id, a2, a1, attrs)</a></td></tr>
+<tr class="component2-color"><td>Agent</td><td><a title="agent">agent(id, [ attr1=val1, ...])</a></td></tr>
+<tr class="component2-color"><td>Attribution</td><td>wasAttributedTo(id,e,ag,attr)</td></tr>
+<tr class="component2-color"><td>Association</td><td>wasAssociatedWith(id,a,ag,pl,attrs)</td></tr>
+<tr class="component2-color"><td>Responsibility</td><td>actedOnBehalfOf(id,ag2,ag1,a,attrs)</td></tr>
+<tr class="component3-color"><td>Derivation</td><td>wasDerivedFrom(id, e2, e1, a, g2, u1, attrs)</td></tr>
+<tr class="component3-color"><td>Revision</td><td>wasRevisionOf(id,e2,e1,ag,attrs)</td></tr>
+<tr class="component3-color"><td>Quotation</td><td>wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</td></tr>
+<tr class="component3-color"><td>Original Source</td><td>hadOriginalSource(id,e2,e1,attrs)</td></tr>
+<tr class="component3-color"><td></td><td>tracedTo(id,e2,e1,attrs)</td></tr>
+<tr class="component4-color"><td>Alternate</td><td>alternateOf(alt1, alt2)</td></tr>
+<tr class="component4-color"><td>Specialization</td><td>specializationOf(sub, super)</td></tr>
+<tr class="component5-color"><td>Derivation by Insertion</td><td>derivedByInsertionFrom(id, collAfter, collBefore, key, value, attrs)</td></tr>
+<tr class="component5-color"><td>Derivation by Removal</td><td>derivedByRemovalFrom(id, collAfter, collBefore, key, attrs)</td></tr>
+<tr class="component5-color"><td>Containment</td><td>contained(id, coll, key, values, attrs)</td></tr>
+<tr class="component5-color"><td></td><td>derivedByBulkInsertionFrom(id, collAfter, collBefore, key-value-set, attrs)</td></tr>
+<tr class="component5-color"><td></td><td>derivedByBulkRemovalFrom(id, collAfter, collBefore, key-set, attrs)</td></tr>
+<tr class="component5-color"><td></td><td>containedBulk(id, coll, key-value-set, attrs)</td></tr>
+<tr class="component6-color"><td></td><td>note(id, [ attr1=val1, ...])</td></tr>
+<tr class="component6-color"><td></td><td>hasAnnotation(r,n)</td></tr>
+</table>
+</div>
<section id="component1">
@@ -893,7 +925,7 @@
<div class="glossary-ref" ref="glossary-entity" withspan="true"></div>
-<p><div class="attributes" id="attributes-entity">An entity<span class="withPn">, written <span class="pnExpression" id="pn-entity">entity(id, [ attr1=val1, ...])</span> in PROV-N, </span> contains:
+<p><div class="attributes" id="attributes-entity">An <dfn title="dfn-Entity">entity</dfn><span class="withPn">, written <span class="pnExpression" id="pn-entity">entity(id, [ attr1=val1, ...])</span> in PROV-N, </span> contains:
<ul>
<li><span class='attribute'>id</span>: an identifier for an entity; </li>
<li><span class='attribute'>attributes</span>: an OPTIONAL set of attribute-value pairs representing this entity's situation in the world.</li>
@@ -938,7 +970,7 @@
<div class="glossary-ref" ref="glossary-activity" withspan="true"></div>
-<p><div class="attributes" id="attributes-activity"> An activity<span class="withPn">, written <span class="pnExpression" id="pn-activity">activity(id, st, et, [ attr1=val1, ...])</span> in PROV-N,</span> contains:
+<p><div class="attributes" id="attributes-activity"> An <dfn title="dfn-Activity">activity</dfn><span class="withPn">, written <span class="pnExpression" id="pn-activity">activity(id, st, et, [ attr1=val1, ...])</span> in PROV-N,</span> contains:
<ul>
<li><span class='attribute'>id</span>: an identifier for an activity;</li>
<li><span class='attribute'>startTime</span>: an OPTIONAL time for the start of the activity;</li>