--- a/model/working-copy/wd5-prov-n.html Thu Mar 15 11:24:41 2012 -0400
+++ b/model/working-copy/wd5-prov-n.html Thu Mar 15 22:25:08 2012 +0000
@@ -487,15 +487,16 @@
<span class="nonterminal">generationExpression</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="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
-<span class="optional"><span class="nonterminal">aIdentifier</span></span>
-<span class="optional"><span class="name">,</span>
-<span class="nonterminal">time</span></span>
+(<span class="nonterminal">aIdentifier</span> | <span class="name">-</span>)
+<span class="nonterminal">optional-time</span>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span><br/>
+<span class="nonterminal">optional-identifier</span> ::= <span class="optional"><span class="nonterminal">identifier</span><span class="name">,</span> </span><br/>
+<span class="nonterminal">optional-time</span> ::= <span class="optional"><span class="name">,</span>
+<span class="nonterminal">time</span></span>
</div>
</div>
@@ -505,6 +506,8 @@
wasGeneratedBy(tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00)
wasGeneratedBy(ex:g1, tr:WD-prov-dm-20111215, ex:edit1)
wasGeneratedBy(e2, a1, [ex:fct="save"])
+wasGeneratedBy(e2, -)
+wasGeneratedBy(e2, -, [ex:fct="save"])
</pre>
</div>
@@ -520,17 +523,11 @@
<span class="nonterminal">usageExpression</span> ::=
<span class="name">used</span>
<span class="name">(</span>
-<span class="optional">
-<span class="nonterminal">identifier</span>
-<span class="name">,</span>
-</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>
-<span class="optional">
-<span class="name">,</span>
- <span class="nonterminal">time</span>
-</span>
+<span class="nonterminal">optional-time</span>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span><br/>
</div>
@@ -538,9 +535,9 @@
<div class="anexample">
<pre class="codeexample">
-used(ex:pub2, ar3:0111)
-used(ex:pub2, ar3:0111, 2011-11-16T16:00:00)
-used(ex:u1, ex:pub2, ar3:0111)
+used(ex:act2, ar3:0111)
+used(ex:act2, ar3:0111, 2011-11-16T16:00:00)
+used(ex:u1, ex:act2, ar3:0111)
used(a1,e1,[ex:fct="load"])
</pre>
</div>
@@ -558,13 +555,23 @@
<span class="nonterminal">startExpression</span> ::=
<span class="name">wasStartedBy</span>
<span class="name">(</span>
-<span class="optional"> <span class="nonterminal">identifier</span>,</span>
-<span class="nonterminal">aIdentifier</span>,
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>
+<span class="name">,</span>
+<span class="nonterminal">eIdentifier</span>
+<span class="nonterminal">optional-time</span>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
+<div class="anexample">
+<pre class="codeexample">
+wasStartedBy(ex:act2, ar3:0111)
+wasStartedBy(ex:act2, ar3:0111, 2011-11-16T16:00:00)
+wasStartedBy(ex:act2, -, 2011-11-16T16:00:00)
+wasStartedBy(ex:act2, -)
+</pre>
+</div>
</section>
@@ -579,16 +586,21 @@
<span class="nonterminal">endExpression</span> ::=
<span class="name">wasEndedBy</span>
<span class="name">(</span>
-<span class="optional"> <span class="nonterminal">identifier</span>,</span>
-<span class="nonterminal">aIdentifier</span>,
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>
+<span class="name">,</span>
+<span class="nonterminal">eIdentifier</span>
+<span class="nonterminal">optional-time</span>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
<div class="anexample">
<pre class="codeexample">
-TODO
+wasEndedBy(ex:act2, ex:trigger)
+wasEndedBy(ex:act2, ex:trigger, 2011-11-16T16:00:00)
+wasEndedBy(ex:act2, -, 2011-11-16T16:00:00)
+wasEndedBy(e,ex:act2, -)
</pre>
</div>
@@ -602,9 +614,7 @@
<span class="nonterminal">informationFlowOrderingExpression</span> ::=
<span class="name">wasInformedBy</span>
<span class="name">(</span>
-<span class="optional"><span class="nonterminal">identifier</span>
-<span class="name">,</span>
-</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">aIdentifier</span>
@@ -626,9 +636,7 @@
<span class="nonterminal">controlOrderingExpression</span> ::=
<span class="name">wasStartedBy</span>
<span class="name">(</span>
-<span class="optional"><span class="nonterminal">identifier</span>
-<span class="name">,</span>
-</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">aIdentifier</span>
@@ -683,6 +691,7 @@
<span class="nonterminal">attributionExpression</span> ::=
<span class="name">wasAttributedTo</span>
<span class="name">(</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">agIdentifier</span>
@@ -694,6 +703,7 @@
<pre class="codeexample">
wasAttributedTo(e,ag)
wasAttributedTo(e,ag,[ex:license="cc:attributionURL" %% "xsd:QName"])
+wasAttributedTo(id,e,ag,[ex:license="cc:attributionURL" %% "xsd:QName"])
</pre>
</div>
@@ -710,7 +720,7 @@
<span class="nonterminal">activityAssociationExpression</span> ::=
<span class="name">wasAssociatedWith</span>
<span class="name">(</span>
-<span class="optional"><span class="nonterminal">identifier</span>,</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">aIdentifier</span>,
<span class="nonterminal">agIdentifier</span>
<span class="optional">,<span class="nonterminal">eIdentifier</span></span>
@@ -736,7 +746,7 @@
<span class="nonterminal">responsibilityExpression</span> ::=
<span class="name">actedOnBehalfOf</span>
<span class="name">(</span>
-<span class="optional"> <span class="nonterminal">identifier</span>,</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">agIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">agIdentifier</span>
@@ -769,7 +779,7 @@
<span class="nonterminal">derivationExpression</span> ::=
<span class="name">wasDerivedFrom</span>
<span class="name">(</span>
-<span class="optional"> <span class="nonterminal">identifier</span>,</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>
@@ -799,11 +809,12 @@
<span class="nonterminal">revisionExpression</span> ::=
<span class="name">wasRevisionOf</span>
<span class="name">(</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>
<span class="optional"><span class="name">,</span>
-<span class="nonterminal">agIdentifier</span></span>
+( <span class="nonterminal">agIdentifier</span> | '-' )</span>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
@@ -814,6 +825,8 @@
wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium)
wasRevisionOf(id,tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium)
+wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
+wasRevisionOf(id,tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
</pre>
</div>
@@ -828,6 +841,7 @@
<span class="nonterminal">quotationExpression</span> ::=
<span class="name">wasQuotedFrom</span>
<span class="name">(</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>
@@ -861,6 +875,7 @@
<span class="nonterminal">originalSourceExpression</span> ::=
<span class="name">hadOriginalSource</span>
<span class="name">(</span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>
@@ -887,8 +902,7 @@
<span class="nonterminal">traceabilityExpression</span> ::=
<span class="name">tracedTo</span>
<span class="name">(</span>
-<span class="optional"><span class="nonterminal">identifier</span>
-<span class="name">,</span></span>
+<span class="nonterminal">optional-identifier</span>
<span class="nonterminal">eIdentifier</span>
<span class="name">,</span>
<span class="nonterminal">eIdentifier</span>