--- a/model/prov-n.html Mon May 28 15:09:43 2012 +0100
+++ b/model/prov-n.html Mon May 28 15:17:27 2012 +0100
@@ -1255,8 +1255,9 @@
</pre>
</div>
-<p><strong>Note:</strong>The production <a class="grammarRef" href="#prod-associationExpression">associationExpression</a> allows for expressions <span class="name">wasAssociatedWith(a, -, -)</span> and <span class="name">wasAssociatiedWith(-, a, -, -)</span>. However, these expressions are not valid in PROV-N,
-because at least one of <span class='attribute'>agent</span> or <span class='attribute'>plan</span> MUST be present.</p>
+<p><strong>Note:</strong>The production <code class="content"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></code> allows for expressions <span class="name">wasAssociatedWith(a, -, -)</span> and <span class="name">wasAssociatiedWith(-; a, -, -)</span>. However, these expressions are not valid in PROV-N,
+since
+at least one of <a href="http://www.w3.org/TR/prov-dm/#association.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#association.agent"><span class='attribute'>agent</span></a>, <a href="http://www.w3.org/TR/prov-dm/#association.plan"><span class='attribute'>plan</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#association.attributes"><span class='attribute'>attributes</span></a> MUST be present.</p>
</section>
<section id="expression-delegation">
@@ -1287,13 +1288,13 @@
<div class="anexample">
<pre class="codeexample">
-actedOnBehalfOf(act1; ag1, ag2, a, [prov:type="contract"])
+actedOnBehalfOf(del1; ag2, ag1, a, [prov:type="contract"])
</pre>
-<p> Here <span class="name">act1</span> is the optional attribution identifier,
- <span class="name">ag1</span> is the identifier for the subordinate agent,
- <span class="name">ag2</span> is the identifier of the responsible agent,
- <span class="name">a</span> is the optional identifier of the activity for which the responsibility link holds,
- and <span class="name"> [prov:type="contract"]</span> are optional attributes. </p>
+<p> Here <span class="name">del1</span> is the optional delegation identifier,
+ <span class="name">ag2</span> is the identifier for the delegate agent,
+ <span class="name">ag1</span> is the identifier of the responsible agent,
+ <span class="name">a</span> is the optional identifier of the activity for which the delegation link holds,
+ and <span class="name">[prov:type="contract"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
@@ -1345,7 +1346,7 @@
<div class="anexample">
<pre class="codeexample">
-wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:comment="a righteous derivation"])
+wasDerivedFrom(d, e2, e1, a, g2, u1, [ex:comment="a righteous derivation"])
</pre>
<p> Here
<span class="name">d</span> is the optional derivation identifier,
@@ -1354,7 +1355,7 @@
<span class="name">a</span> is the optional identifier of the activity which used/generated the entities,
<span class="name">g2</span> is the optional identifier of the generation,
<span class="name">u1</span> is the optional identifier of the usage,
- and <span class="name">[prov:comment="a righteous derivation"]</span> are optional attributes. </p>
+ and <span class="name">[ex:comment="a righteous derivation"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
@@ -1403,7 +1404,7 @@
<div class="anexample">
<pre class="codeexample">
-wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u, [prov:comment="??"] )
+wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u, [ex:comment="??"] )
</pre>
<p> Here
<span class="name">rev1</span> is the optional revision identifier,
@@ -1412,7 +1413,7 @@
<span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">tr:WD-prov-dm-20111215</span> and <span class="name">tr:WD-prov-dm-20111018</span>,
<span class="name">ex:g</span> is the identifier for the generation involving the revised entity <span class="name">tr:WD-prov-dm-20111215</span> and activity <span class="name">ex:act1</span>;
<span class="name">ex:u</span> is the identifier for the usage involving the used entity <span class="name">tr:WD-prov-dm-20111018</span> and activity <span class="name">ex:act1</span>,
- and <span class="name"> [prov:comment="??"]</span> are optional attributes. </p>
+ and <span class="name"> [ex:comment="??"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
@@ -1421,7 +1422,7 @@
wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u)
wasRevisionOf(id; tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, , ex:act1, ex:g, ex:u)
wasRevisionOf(id;tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [prov:comment="??"])
+wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ex:comment="??"])
</pre>
</div>
@@ -2127,6 +2128,8 @@
<li> <span class="name">prov:role</span>
<li> <span class="name">prov:type</span>
<li> <span class="name">prov:value</span>
+<li> <span class="name">prov:provenance-uri</span>
+<li> <span class="name">prov:service-uri</span>
</ol>
@@ -2212,13 +2215,17 @@
<p>The reserved type values in the PROV namespace are the following.</p>
<ol>
-<li> <span class="name">prov:Account</span>
-<li> <span class="name">prov:SoftwareAgent</span>
+<li> <span class="name">prov:Bundle</span>
+<li> <span class="name">prov:Collection</span>
+<li> <span class="name">prov:Dictionary</span>
+<li> <span class="name">prov:EmptyDictionary</span>
+<li> <span class="name">prov:HadOriginalSource</span>
+<li> <span class="name">prov:Organization</span>
<li> <span class="name">prov:Person</span>
-<li> <span class="name">prov:Organization</span>
<li> <span class="name">prov:Plan</span>
-<li> <span class="name">prov:Collection</span>
-<li> <span class="name">prov:EmptyCollection</span>
+<li> <span class="name">prov:SoftwareAgent</span>
+<li> <span class="name">prov:WasQuotedFrom</span>
+<li> <span class="name">prov:WasRevisionOf</span>
</ol>
<div class="anexample" id="anexample-types">