--- a/model/ProvenanceModel.html Tue Nov 29 10:42:13 2011 +0000
+++ b/model/ProvenanceModel.html Tue Nov 29 13:28:21 2011 +0000
@@ -351,11 +351,8 @@
<p>Time is critical in the context of provenance, since it can help corroborate provenance claims. For instance, if an entity is claimed to be obtained by transforming another, then the latter must have existed before the former. If it is not the case, then there is something wrong in such a provenance claim. </p>
-<<<<<<< local
<p> Although time is critical, we should also recognize that provenance can be used in many different contexts: in a single system, across the Web, or in spatial data management, to name a few. Hence, it is a design objective of PROV-DM to minimize the assumptions about time, so that PROV-DM can be used in varied contexts. </p>
-=======
-<p> Time is critical, but we should also recognize that provenance can be used in many different contexts: in a single system, across the Web, or in spatial applications, to name a few. Hence, it is a design objective of PROV-DM to minimize the assumptions about time, so that PROV-DM can be used in varied contexts. </p>
->>>>>>> other
+
<p>Furthermore, consider two activities that started at the same time
instant. Just by referring to that instant, we cannot distinguish
@@ -1194,6 +1191,8 @@
<p>In PROV-DM, a <dfn id="dfn-Generation">generation record</dfn> is a representation of a world <a title="entity generation event">event</a>, the creation of a new entity by an activity. This entity did not exist before creation.
The representation of this <a>event</a> encompasses a description of the modalities of generation of this entity by this activity.</p>
+<p>A generation event may be the creation of a file by a program, the creation of a linked data set, the production of a new version of a document, the sending of a value on a communication channel.
+</p>
<p>A generation record, written <span class="name">wasGeneratedBy(id,e,a,attrs,t)</span> in PROV-ASN, has the following components:</p>
<ul>
@@ -1212,8 +1211,8 @@
<span class="nonterminal">generationRecord</span> :=
<span class="name">wasGeneratedBy</span>
<span class="name">(</span>
-<span class="optional"><span class="nonterminal">identifier</span>
-<span class="name">,</span></span>
+<span class="optional"> <span class="nonterminal">identifier</span>
+<span class="name">,</span> </span>
<span class="nonterminal">identifier</span>
<span class="name">,</span>
<span class="nonterminal">identifier</span>