--- a/model/ProvenanceModel.html Wed Sep 14 07:54:19 2011 +0200
+++ b/model/ProvenanceModel.html Wed Sep 14 09:47:40 2011 +0100
@@ -1375,22 +1375,22 @@
</section>
-<p>PROV-DM allows two forms of temporal relationships between process executions to be expressed.
-An <dfn id="InformationFlowOrdering">information flow ordering expression</dfn> is a representation that a characterized thing was generated by an activity, represented by a process execution, before it was used by another activity, also represented by a process execution.
+<p>PROV-DM allows two forms of temporal relationships between activities to be expressed.
+An <dfn id="InformationFlowOrdering">information flow ordering expression</dfn> is a representation that a characterized thing was generated by an activity, represented by a process execution expresion, before it was used by another activity, also represented by a process execution expression.
A <dfn id="ControlOrdering">control ordering expression</dfn> is a representation that the end of
an activity, represented by a process execution, precedes the start of another activity, represented by process execution.
</p>
-<p>In PROV-ASN, a process execution ordering expression's text matches the <span class="nonterminal">peOrdering</span> production of the grammar defined in this specification document.
+<p>In PROV-ASN, a process execution ordering expression's text matches the <span class="nonterminal">peOrderingExpression</span> production of the grammar defined in this specification document.
</p>
<div class='grammar'>
-<span class="nonterminal">peOrdering</span> :=
-<span class="nonterminal">informationFlowOrdering</span> |
-<span class="nonterminal">controlOrdering</span>
+<span class="nonterminal">peOrderingExpression</span> :=
+<span class="nonterminal">informationFlowOrderingExpression</span> |
+<span class="nonterminal">controlOrderingExpression</span>
<br/>
-<span class="nonterminal">informationFlowOrdering</span> :=
+<span class="nonterminal">informationFlowOrderingExpression</span> :=
<span class="name">wasInformedBy</span>
<span class="name">(</span>
<span class="nonterminal">identifier</span>
@@ -1399,7 +1399,7 @@
<span class="name">)</span>
<br/>
-<span class="nonterminal">controlOrdering</span> :=
+<span class="nonterminal">controlOrderingExpression</span> :=
<span class="name">wasScheduledAfter</span>
<span class="name">(</span>
<span class="nonterminal">identifier</span>
@@ -1414,17 +1414,16 @@
An instance of an information flow ordering expression, written as
<span class="name">wasInformedBy(pe2,pe1)</span> in PROV-ASN:
<ul>
-<li> refers to a process execution <span class="name">pe2</span>;
-<li> refers to a process execution <span class="name">pe1</span>
+<li> refers to a process execution expression identified by <span class="name">pe2</span>;
+<li> refers to a process execution expression identified by <span class="name">pe1</span>
</ul>
-and states information flow ordering between <span class="name">pe2</span> and <span class="name">pe1</span>.
-The meaning of the <span class="name">wasInformedBy</span> construct is specified as follows.
-
-<div class='constraint' id='wasInformedBy'>Given two process executions denoted by <span class="name">pe1</span> and <span class="name">pe2</span>,
+and states information flow ordering between the activities represented by these expression, specified as follows.
+
+<div class='constraint' id='wasInformedBy'>Given two process execution expressions denoted by <span class="name">pe1</span> and <span class="name">pe2</span>,
the expression <span class="name">wasInformedBy(pe2,pe1)</span>
holds, <span class='conditional'>if and only if</span>
- there is an entity denoted by <span class="name">e</span> and roles <span class="name">r1</span> and <span class="name">r2</span>,
-such that <span class="name">wasGeneratedBy(e,pe1,r1)</span> and <span class="name">used(pe2,e,r2)</span> hold.
+ there is an entity expression denoted by <span class="name">e</span> and qualifiers <span class="name">q1</span> and <span class="name">q2</span>,
+such that <span class="name">wasGeneratedBy(e,pe1,q1)</span> and <span class="name">used(pe2,e,q2)</span> hold.
</div>
@@ -1433,18 +1432,18 @@
An instance of a control ordering expression, written as
<span class="name">wasScheduledAfter(pe2,pe1)</span> in PROV-ASN:
<ul>
-<li> refers to a process execution <span class="name">pe2</span>;
-<li> refers to a process execution <span class="name">pe1</span>,
+<li> refers to a process execution expression denoted by <span class="name">pe2</span>;
+<li> refers to a process execution expression denoted by <span class="name">pe1</span>,
</ul>
-and states control ordering between <span class="name">pe2</span> and <span class="name">pe1</span>.
-The meaning of the <span class="name">wasScheduledAfter</span> expression is as follows.
-
-<div class='constraint' id='wasScheduledAfter'>Given two process executions denoted by <span class="name">pe1</span> and <span class="name">pe2</span>,
+and states control ordering between <span class="name">pe2</span> and <span class="name">pe1</span>, specified as follows.
+
+<div class='constraint' id='wasScheduledAfter'>Given two process execution expressions denoted by <span class="name">pe1</span> and <span class="name">pe2</span>,
the expression <span class="name">wasScheduledAfter(pe2,pe1)</span>
holds, <span class='conditional'>if and only if</span>
- there are two entities denoted by <span class="name">e1</span> and <span class="name">e2</span>,
-such that <span class="name">wasControlledBy(pe1,e1,end)</span> and <span class="name">wasControlledBy(pe2,e2,start)</span> and <span class="name">wasDerivedFrom(e2,e1)</span>.
+ there are two entity expressions denoted by <span class="name">e1</span> and <span class="name">e2</span>,
+such that <span class="name">wasControlledBy(pe1,e1,[role="end"])</span> and <span class="name">wasControlledBy(pe2,e2,[role="start"])</span> and <span class="name">wasDerivedFrom(e2,e1)</span>.
</div>
+This definition assumes that the activities represented by process execution expressions identified by <span class="name">pe1</span> and <span class="name">pe2</span> are controlled by some agents, represented by expressions identified by <span class="name">e1</span> and <span class="name">e2</span>, where the first agent terminates (control qualifier <span class="name">[role="end"]</span>) the first activity, and the second initiates (control qualifier <span class="name">[role="start"]</span>) the second. The second agent being "derived" from the first enforces temporal ordering.
<div class='note'>This definition assumes that there are some predefined role
@@ -1460,11 +1459,11 @@
<p> A <dfn id="dfn-Revision">revision expression</dfn> is a representation of the creation of a characterized thing considered to be a variant of another. Deciding whether something is made available as a revision of something else usually involves an agent who is responsible for declaring that the former is variant of the latter. </p>
-<p>In PROV-ASN, a revision expression's text matches the <span class="nonterminal">revision</span> production of the grammar defined in this specification document.
+<p>In PROV-ASN, a revision expression's text matches the <span class="nonterminal">revisionExpression</span> production of the grammar defined in this specification document.
</p>
<div class='grammar'>
-<span class="nonterminal">revision</span> :=
+<span class="nonterminal">revisionExpression</span> :=
<span class="name">wasRevisionOf</span>
<span class="name">(</span>
<span class="nonterminal">identifier</span>