merged with 1400
authorPaolo Missier <pmissier@acm.org>
Thu, 19 Jan 2012 09:50:06 +0000
changeset 1408 5b51161ee3e1
parent 1405 7a7b6440329c (current diff)
parent 1407 dc8c9bc9e1c1 (diff)
child 1409 f54007ca8ef1
merged with 1400
model/ProvenanceModel.html
--- a/model/ProvenanceModel.html	Thu Jan 19 09:17:10 2012 +0000
+++ b/model/ProvenanceModel.html	Thu Jan 19 09:50:06 2012 +0000
@@ -604,7 +604,8 @@
 <ul>
   <li>An <a title="entity record">Entity Record</a> (noted <samp>entity</samp> in the diagram, to reflect the term used in the ASN) is a representation of an <em>entity</em>. 
 
-  <li>An <a title="activity record">Activity Record</a>(noted <samp>activity</samp> in the diagram) represents an activity that has an effect on entities, namely it either <em>generates</em> or <em>uses</em> one or more entities. Usage and generation are modelled by means of the <a title="usage record">used</a> and the <a title="generation record">wasGeneratedBy</a> relationships.  Activities may include not only computations, but also any other type of activity that can be described in terms of their effect on <samp>entities</samp>.
+   <li>An <a title="activity record">Activity Record</a>(noted <samp>activity</samp> in the diagram) represents an activity that has an effect on entities, namely it either <em>generates</em>  or <em>uses</em> one or more entities.
+  Usage and generation are modelled by means of the <a title="usage record">used</a> and the <a title="generation record">wasGeneratedBy</a> relationships.  Activities may include not only computations, but also any other type of activity that can be described in terms of their effect on <samp>entities</samp>.
 Note that multiple <samp>activities</samp> may <em>use</em> the same <samp>entity</samp>, and each activity may use multiple <samp>entities</samp>. Finally, entities can be derived from other entities, and this is specified using the <a title="derivation record">wasDerivedFrom</a> relation.</li>
   
   <li>An <a title="agent record">Agent Record</a> represents a particular <samp>entity</samp> that can be associated to activities, meaning that it can be assigned some degree of responsibility for an <samp>activity</samp> taking place.