--- a/model/releases/ED-prov-n-20120614/prov-n.html Thu Jun 14 10:03:40 2012 +0100
+++ b/model/releases/ED-prov-n-20120614/prov-n.html Thu Jun 14 10:17:11 2012 +0100
@@ -953,8 +953,8 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Entity</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#entity.id"><span class="attribute" id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#entity.attributes"><span class="attribute" id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.id"><span class="attribute" id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.attributes"><span class="attribute" id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1003,15 +1003,15 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Activity</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#activity.id"><span class="attribute" id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#activity.startTime"><span class="attribute" id="activity.startTime">startTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#activity.endTime"><span class="attribute" id="activity.endTime">endTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#activity.attributes"><span class="attribute" id="activity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.id"><span class="attribute" id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.startTime"><span class="attribute" id="activity.startTime">startTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.endTime"><span class="attribute" id="activity.endTime">endTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.attributes"><span class="attribute" id="activity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1069,13 +1069,13 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Generation</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.id"><span class="attribute" id="generation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.entity"><span class="attribute" id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.activity"><span class="attribute" id="generation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.time"><span class="attribute" id="generation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.attributes"><span class="attribute" id="generation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="attribute" id="generation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.entity"><span class="attribute" id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class="attribute" id="generation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.time"><span class="attribute" id="generation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.attributes"><span class="attribute" id="generation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1097,7 +1097,7 @@
</pre>
</div>
-<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></code> allows for expressions <span class="name">wasGeneratedBy(e2, -, -)</span> and <span class="name">wasGeneratedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since at least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.activity"><span class="attribute">activity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.time"><span class="attribute">time</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#generation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></code> allows for expressions <span class="name">wasGeneratedBy(e2, -, -)</span> and <span class="name">wasGeneratedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since at least one of <a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class="attribute">activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.time"><span class="attribute">time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#generation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
@@ -1137,13 +1137,13 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Usage</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.id"><span class="attribute" id="usage.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.activity"><span class="attribute" id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.entity"><span class="attribute" id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.time"><span class="attribute" id="usage.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.attributes"><span class="attribute" id="usage.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute" id="usage.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.activity"><span class="attribute" id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute" id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute" id="usage.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute" id="usage.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1164,7 +1164,7 @@
</div>
-<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code> allows for expressions <span class="name">used(a2, -, -)</span> and <span class="name">used(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since at least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.entity"><span class="attribute">entity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.time"><span class="attribute">time</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code> allows for expressions <span class="name">used(a2, -, -)</span> and <span class="name">used(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since at least one of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute">entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute">time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
@@ -1200,10 +1200,10 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Communication</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#communication.id"><span class="attribute" id="communication.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#communication.informed"><span class="attribute" id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#communication.informant"><span class="attribute" id="communication.informant">informant</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#communication.attributes"><span class="attribute" id="communication.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class="attribute" id="communication.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informed"><span class="attribute" id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informant"><span class="attribute" id="communication.informant">informant</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.attributes"><span class="attribute" id="communication.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1240,15 +1240,15 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Start</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.id"><span class="attribute" id="start.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.activity"><span class="attribute" id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.trigger"><span class="attribute" id="start.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.starter"><span class="attribute" id="start.starter">starter</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.time"><span class="attribute" id="start.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.attributes"><span class="attribute" id="start.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="attribute" id="start.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.activity"><span class="attribute" id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.trigger"><span class="attribute" id="start.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.starter"><span class="attribute" id="start.starter">starter</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.time"><span class="attribute" id="start.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.attributes"><span class="attribute" id="start.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1273,7 +1273,7 @@
</div>
<p><strong>Note:</strong> Even though the production <code class="content"><a class="grammarRef" href="#prod-startExpression">startExpression</a></code> allows for expressions <span class="name">wasStartedBy(e2, -, -)</span> and <span class="name">wasStartedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N,
-since at least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.trigger"><span class="attribute">trigger</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.starter"><span class="attribute">starter</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.time"><span class="attribute">time</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#start.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+since at least one of <a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.trigger"><span class="attribute">trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.starter"><span class="attribute">starter</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.time"><span class="attribute">time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#start.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
</div>
@@ -1305,15 +1305,15 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>End</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.id"><span class="attribute" id="end.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.activity"><span class="attribute" id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.trigger"><span class="attribute" id="end.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.ender"><span class="attribute" id="end.ender">ender</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.time"><span class="attribute" id="end.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.attributes"><span class="attribute" id="end.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute" id="end.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.activity"><span class="attribute" id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class="attribute" id="end.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.ender"><span class="attribute" id="end.ender">ender</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute" id="end.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute" id="end.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1340,7 +1340,7 @@
</div>
<p><strong>Note:</strong>Even though the production <code class="content"><a class="grammarRef" href="#prod-endExpression">endExpression</a></code> allows for expressions <span class="name">wasEndedBy(e2, -, -)</span> and <span class="name">wasEndedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N,
-since at least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.trigger"><span class="attribute">trigger</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.ene"><span class="attribute">ender</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.time"><span class="attribute">time</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#end.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+since at least one of <a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class="attribute">trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.ene"><span class="attribute">ender</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute">time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
</div>
@@ -1377,13 +1377,13 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Invalidation</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.id"><span class="attribute" id="invalidation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.entity"><span class="attribute" id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.activity"><span class="attribute" id="invalidation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.time"><span class="attribute" id="invalidation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.attributes"><span class="attribute" id="invalidation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute" id="invalidation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.entity"><span class="attribute" id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class="attribute" id="invalidation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute" id="invalidation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute" id="invalidation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1405,7 +1405,7 @@
</div>
<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></code> allows for expressions <span class="name">wasInvalidatedBy(e2, -, -)</span> and <span class="name">wasInvalidatedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since
-since at least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.activity"><span class="attribute">activity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.time"><span class="attribute">time</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#invalidation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+since at least one of <a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class="attribute">activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute">time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
@@ -1488,22 +1488,22 @@
<tbody><tr><td><b>Derivation</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.id"><span class="attribute" id="derivation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.generatedEntity"><span class="attribute" id="derivation.generatedEntity">generatedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.usedEntity"><span class="attribute" id="derivation.usedEntity">usedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.activity"><span class="attribute" id="derivation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.generation"><span class="attribute" id="derivation.generation">generation</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.usage"><span class="attribute" id="derivation.usage">usage</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></code></td></tr>
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#derivation.attributes"><span class="attribute" id="derivation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.id"><span class="attribute" id="derivation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.generatedEntity"><span class="attribute" id="derivation.generatedEntity">generatedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.usedEntity"><span class="attribute" id="derivation.usedEntity">usedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.activity"><span class="attribute" id="derivation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.generation"><span class="attribute" id="derivation.generation">generation</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.usage"><span class="attribute" id="derivation.usage">usage</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></code></td></tr>
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.attributes"><span class="attribute" id="derivation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1736,8 +1736,8 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Agent</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#agent.id"><span class="attribute" id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#agent.attributes"><span class="attribute" id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.id"><span class="attribute" id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.attributes"><span class="attribute" id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1786,12 +1786,12 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b>Attribution</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#attribution.id"><span class="attribute" id="attribution.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#attribution.entity"><span class="attribute" id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-Identifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#attribution.agent"><span class="attribute" id="attribution.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#attribution.attributes"><span class="attribute" id="attribution.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.id"><span class="attribute" id="attribution.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.entity"><span class="attribute" id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.agent"><span class="attribute" id="attribution.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.attributes"><span class="attribute" id="attribution.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1846,16 +1846,16 @@
<tbody><tr><td><b>Association</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.id"><span class="attribute" id="association.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.activity"><span class="attribute" id="association.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.agent"><span class="attribute" id="association.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifierOrMarker">agIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.plan"><span class="attribute" id="association.plan">plan</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.attributes"><span class="attribute" id="association.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="attribute" id="association.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.activity"><span class="attribute" id="association.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.agent"><span class="attribute" id="association.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifierOrMarker">agIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.plan"><span class="attribute" id="association.plan">plan</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.attributes"><span class="attribute" id="association.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1883,7 +1883,7 @@
<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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.agent"><span class="attribute">agent</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.plan"><span class="attribute">plan</span></a>, and <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#association.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+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> <em class="rfc2119" title="must">must</em> be present.</p>
</div>
<div id="expression-delegation" class="section">
@@ -1917,17 +1917,17 @@
<tbody><tr><td><b>Delegation</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#delegation.id"><span class="attribute" id="delegation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#delegation.delegate"><span class="attribute" id="delegation.delegate">delegate</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#delegation.responsible"><span class="attribute" id="delegation.responsible">responsible</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#delegation.activity"><span class="attribute" id="delegation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#delegation.attributes"><span class="attribute" id="delegation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.id"><span class="attribute" id="delegation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.delegate"><span class="attribute" id="delegation.delegate">delegate</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.responsible"><span class="attribute" id="delegation.responsible">responsible</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.activity"><span class="attribute" id="delegation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.attributes"><span class="attribute" id="delegation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -1971,14 +1971,14 @@
<tbody><tr><td><b>Trace</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#trace.id"><span class="attribute" id="trace.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#trace.entity"><span class="attribute" id="trace.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#trace.ancestor"><span class="attribute" id="trace.ancestor">ancestor</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#trace.attributes"><span class="attribute" id="trace.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.id"><span class="attribute" id="trace.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.entity"><span class="attribute" id="trace.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.ancestor"><span class="attribute" id="trace.ancestor">ancestor</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.attributes"><span class="attribute" id="trace.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -2058,10 +2058,10 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#alternate.alternate1"><span class="attribute" id="alternate.alternate1">alternate1</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#alternate.alternate2"><span class="attribute" id="alternate.alternate2">alternate2</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate1"><span class="attribute" id="alternate.alternate1">alternate1</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate2"><span class="attribute" id="alternate.alternate2">alternate2</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
</tbody></table>
</div>
@@ -2103,10 +2103,10 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
</tbody></table>
</div>
@@ -2138,12 +2138,12 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#contextualization.specificEntity"><span class="attribute" id="contextualization.local">local</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#contextualization.generalEntity"><span class="attribute" id="contextualization.contextualized">contextualized</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#contextualization.context"><span class="attribute" id="contextualization.context">context</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.specificEntity"><span class="attribute" id="contextualization.local">local</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.generalEntity"><span class="attribute" id="contextualization.contextualized">contextualized</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.context"><span class="attribute" id="contextualization.context">context</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
</tbody></table>
</div>
@@ -2236,16 +2236,16 @@
<tbody><tr><td><b>Insertion</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#insertion.id"><span class="attribute" id="insertion.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#insertion.after"><span class="attribute" id="insertion.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#insertion.before"><span class="attribute" id="insertion.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#insertion.key-entity-set"><span class="attribute" id="insertion.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#insertion.attributes"><span class="attribute" id="insertion.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.id"><span class="attribute" id="insertion.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.after"><span class="attribute" id="insertion.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.before"><span class="attribute" id="insertion.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.key-entity-set"><span class="attribute" id="insertion.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.attributes"><span class="attribute" id="insertion.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -2305,16 +2305,16 @@
<tbody><tr><td><b>Removal</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#removal.id"><span class="attribute" id="removal.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#removal.after"><span class="attribute" id="removal.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#removal.before"><span class="attribute" id="removal.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#removal.key-set"><span class="attribute" id="removal.key-set">key-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet">keySet</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#removal.attributes"><span class="attribute" id="removal.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.id"><span class="attribute" id="removal.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.after"><span class="attribute" id="removal.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.before"><span class="attribute" id="removal.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.key-set"><span class="attribute" id="removal.key-set">key-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet">keySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.attributes"><span class="attribute" id="removal.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -2375,15 +2375,15 @@
<tbody><tr><td><b>Collection Membership</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership.id"><span class="attribute" id="membership.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership.collection"><span class="attribute" id="membership.collection">collection</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership.entity-set"><span class="attribute" id="membership.entity-set">entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-entitySet">entitySet</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership.complete"><span class="attribute" id="membership.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership.attributes"><span class="attribute" id="membership.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.id"><span class="attribute" id="membership.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.collection"><span class="attribute" id="membership.collection">collection</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.entity-set"><span class="attribute" id="membership.entity-set">entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-entitySet">entitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.complete"><span class="attribute" id="membership.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.attributes"><span class="attribute" id="membership.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -2392,15 +2392,15 @@
<tbody><tr><td><b>Dictionary Membership</b></td><td><b>Non-Terminal</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership-d.id"><span class="attribute" id="membership-d.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership-d.dictionary"><span class="attribute" id="membership-d.dictionary">dictionary</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership-d.key-entity-set"><span class="attribute" id="membership-d.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership-d.complete"><span class="attribute" id="membership-d.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120614/prov-n.html#membership-d.attributes"><span class="attribute" id="membership-d.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.id"><span class="attribute" id="membership-d.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.dictionary"><span class="attribute" id="membership-d.dictionary">dictionary</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.key-entity-set"><span class="attribute" id="membership-d.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.complete"><span class="attribute" id="membership-d.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.attributes"><span class="attribute" id="membership-d.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
</tbody></table>
</div>
@@ -2518,6 +2518,7 @@
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">54</span>] </td> <td><code class="production prod">namespaceDeclarations</code></td> <td> ::= </td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></span> | <span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></span> ) (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></span>)*</code></td> </tr> </tbody>
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">55</span>] </td> <td><code class="production prod">namespaceDeclaration</code></td> <td> ::= </td> <td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">57</span>] </td> <td><code class="production prod">namespace</code></td> <td> ::= </td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</a></span></code></td> </tr> </tbody>
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">56</span>] </td> <td><code class="production prod">defaultNamespaceDeclaration</code></td> <td> ::= </td> <td><code class="content">"default" <span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</a></span></code></td> </tr> </tbody>
<tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">63</span>] </td> <td><<code class="production term">IRI_REF</code>></td> <td> ::= </td> <td><code class="content">"<" ( [^<>"{}|^`\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* ">"</code></td> </tr> </tbody>
@@ -2654,7 +2655,7 @@
</div>
-<p><b>Note:</b>The productions for <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">qualifiedName</a></code> and <code class="content"><a class="grammarRef" href="#http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a></code> are conflicting. In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a parser should give precedence to the production for <code class="content"><a class="grammarRef" href="#http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a></code>.
+<p><b>Note:</b>The productions for <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">qualifiedName</a></code> and <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a></code> are conflicting. In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a parser should give precedence to the production for <code class="content"><a class="grammarRef" href="#http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a></code>.
</p>