--- a/model/prov-dm.html Thu May 24 22:53:01 2012 +0100
+++ b/model/prov-dm.html Thu May 24 23:07:27 2012 +0100
@@ -1377,7 +1377,7 @@
<li><span class='attribute' id="generation.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this generation.</li>
</ul></div>
-<p>While each of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
+<p>While each of <a href="#generation.id"><span class='attribute'>id</span></a>, <a href="#generation.activity"><span class='attribute'>activity</span></a>, <a href="#generation.time"><span class='attribute'>time</span></a>, and <a href="#generation.attributes"><span class='attribute'>attributes</span></a> is OPTIONAL, at least one of them MUST be present.</p>
@@ -1387,8 +1387,8 @@
<p>
The following expressions</p>
<pre class="codeexample">
- wasGeneratedBy(e1,a1, 2001-10-26T21:32:52, [ex:port="p1"])
- wasGeneratedBy(e2,a1, 2001-10-26T10:00:00, [ex:port="p2"])
+ wasGeneratedBy(e1, a1, 2001-10-26T21:32:52, [ ex:port="p1" ])
+ wasGeneratedBy(e2, a1, 2001-10-26T10:00:00, [ ex:port="p2" ])
</pre>
<p>state the existence of two generations (with respective times <span class="name">2001-10-26T21:32:52</span> and <span
class="name">2001-10-26T10:00:00</span>), at which new entities, identified by <span class="name">e1</span> and <span class="name">e2</span>, are created by an
@@ -1402,7 +1402,7 @@
<p>
In some cases, we may want to record the time at which an entity was generated without having to specify the activity that generated it. To support this requirement, the activity element in generation is optional. Hence, the following expression indicates the time at which an entity is generated, without naming the activity that did it.</p>
<pre class="codeexample">
- wasGeneratedBy(e,-,2001-10-26T21:32:52)
+ wasGeneratedBy(e, -, 2001-10-26T21:32:52)
</pre>
</div>
@@ -1419,12 +1419,14 @@
<p><div class="attributes" id="attributes-usage"><dfn title="used">Usage</dfn><span class="withPn">, written <span class="pnExpression">used(id;a,e,t,attrs)</span> in PROV-N,</span> has:
<ul>
<li><span class='attribute' id="usage.id">id</span>: an OPTIONAL identifier for a usage;</li>
-<li><span class='attribute' id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the consuming activity;</li>
-<li><span class='attribute' id="usage.entity">entity</span>: an OPTIONAL identifier (<span class="name">e</span>) for the consumed entity;</li>
+<li><span class='attribute' id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the activity that used an entity;</li>
+<li><span class='attribute' id="usage.entity">entity</span>: an OPTIONAL identifier (<span class="name">e</span>) for the entity being used;</li>
<li><span class='attribute' id="usage.time">time</span>: an OPTIONAL "usage time" (<span class="name">t</span>), the time at which the entity started to be used;</li>
<li><span class='attribute' id="usage.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this usage.</li>
</ul></div>
+<p>While each of <a href="#usage.id"><span class='attribute'>id</span></a>, <a href="#usage.entity"><span class='attribute'>entity</span></a>, <a href="#usage.time"><span class='attribute'>time</span></a>, and <a href="#usage.attributes"><span class='attribute'>attributes</span></a> is OPTIONAL, at least one of them MUST be present.</p>
+
<p>
A reference to a given entity MAY appear in multiple usages that share
a given activity identifier.
@@ -1434,8 +1436,8 @@
<div class='anexample'>
<p>The following usages</p>
<pre class="codeexample">
- used(a1,e1,2011-11-16T16:00:00,[ex:parameter="p1"])
- used(a1,e2,2011-11-16T16:00:01,[ex:parameter="p2"])
+ used(a1, e1, 2011-11-16T16:00:00, [ ex:parameter="p1" ])
+ used(a1, e2, 2011-11-16T16:00:01, [ ex:parameter="p2" ])
</pre>
<p>state that the activity identified by <span class="name">a1</span> used two entities identified by <span
class="name">e1</span> and <span class="name">e2</span>, at times <span class="name">2011-11-16T16:00:00</span> and <span class="name">2011-11-16T16:00:01</span>, respectively; the first
@@ -1450,6 +1452,41 @@
</section>
+<section id="term-wasInformedBy">
+<h3>Communication</h3>
+
+<div class="glossary-ref" data-ref="glossary-communication"></div>
+
+
+<p>A communication implies that activity <span class="name">a2</span> is dependent on another <span class="name">a1</span>, by way of some unspecified entity that is generated by <span class="name">a1</span> and used by <span class="name">a2</span>.</p>
+
+
+
+
+<p><div class="attributes" id="attributes-wasInformedBy">
+A <dfn title="wasInformedBy">communication</dfn><span class="withPn">, written as
+<span class="pnExpression">wasInformedBy(id;a2,a1,attrs)</span> in PROV-N,</span> has:
+<ul>
+<li><span class='attribute' id="wasInformedBy.id">id</span>: an OPTIONAL identifier identifying the relation;</li>
+<li><span class='attribute' id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
+<li><span class='attribute' id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
+<li><span class='attribute' id="wasInformedBy.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
+</ul>
+</div>
+
+
+
+<div class="anexample">
+<p>
+Consider two activities <span class="name">a1</span> and <span class="name">a2</span>, the former performed by a government agency, and the latter by a driver caught speeding.
+<pre class="codeexample">
+activity(a1, [ prov:type="traffic regulations enforcing" ])
+activity(a2, [ prov:type="fine paying, check writing, and mailing" ])
+wasInformedBy(a2, a1)
+</pre>
+The last line indicates that some implicit entity was generated by <span class="name">a1</span> and used by <span class="name">a2</span>; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
+</div>
+</section>
<section id="term-Start">
<h4>Start</h4>
@@ -1588,7 +1625,7 @@
<li><span class='attribute'>attributes</span>: an OPTIONAL set of attribute-value pairs representing additional information about this invalidation.</li>
</ul></div>
-<p>While each of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
+<p>While each of <span class='attribute'>id</span>, <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
@@ -1652,41 +1689,6 @@
</section>
-<section id="term-wasInformedBy">
-<h3>Communication</h3>
-
-<div class="glossary-ref" data-ref="glossary-communication"></div>
-
-
-<p>A communication implies that activity <span class="name">a2</span> is dependent on another <span class="name">a1</span>, by way of some unspecified entity that is generated by <span class="name">a1</span> and used by <span class="name">a2</span>.</p>
-
-
-
-
-<p><div class="attributes" id="attributes-wasInformedBy">
-A <dfn title="wasInformedBy">communication</dfn><span class="withPn">, written as
-<span class="pnExpression">wasInformedBy(id;a2,a1,attrs)</span> in PROV-N,</span> has:
-<ul>
-<li><span class='attribute' id="wasInformedBy.id">id</span>: an OPTIONAL identifier identifying the relation;</li>
-<li><span class='attribute' id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
-<li><span class='attribute' id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
-<li><span class='attribute' id="wasInformedBy.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
-</ul>
-</div>
-
-
-
-<div class="anexample">
-<p>
-Consider two activities <span class="name">a1</span> and <span class="name">a2</span>, the former performed by a government agency, and the latter by a driver caught speeding.
-<pre class="codeexample">
-activity(a1, [prov:type="traffic regulations enforcing"])
-activity(a2, [prov:type="fine paying, check writing, and mailing"])
-wasInformedBy(a2,a1)
-</pre>
-The last line indicates that some implicit entity was generated by <span class="name">a1</span> and used by <span class="name">a2</span>; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
-</div>
-</section>