--- a/model/glossary.html Thu Nov 22 19:58:25 2012 +0100
+++ b/model/glossary.html Thu Nov 22 19:59:30 2012 +0100
@@ -81,8 +81,8 @@
-->
-<span class="glossary" id="glossary-activityAssociation">
-An activity <dfn id="concept-activityAssociation">association</dfn> is an assignment of responsibility to an agent for an activity, indicating that the agent had a role in the activity. It further allows for a plan to be specified, which is the plan
+<span class="glossary" id="glossary-association">
+An activity <dfn id="concept-association">association</dfn> is an assignment of responsibility to an agent for an activity, indicating that the agent had a role in the activity. It further allows for a plan to be specified, which is the plan
intended by the agent to achieve some goals in the context of this activity.
</span>
@@ -217,7 +217,7 @@
</span>
<span class="glossary" id="glossary-software-agent">
-A <dfn id="concept-software-agent" title="software-agent">software agent</dfn> is running software.
+A <dfn id="concept-software-agent" title="software-agent">SoftwareAgent</dfn> is running software.
</span>
--- a/model/glossary.js Thu Nov 22 19:58:25 2012 +0100
+++ b/model/glossary.js Thu Nov 22 19:59:30 2012 +0100
@@ -3,7 +3,7 @@
// with <script src="glossary.js" class="remove"></script>
//Insert glossary definitions with the following
// <div class="glossary-ref" ref="glossary-generation"></div>
-glossary_hg='http://dvcs.w3.org/hg/prov/file/56b60b1bf7f6/model/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/beb20fc47489/model/glossary.html';
glossary_string=
' ' +
'<html> ' +
@@ -43,7 +43,7 @@
'</span> ' +
' ' +
'<span class="glossary" id="glossary-collection"> ' +
-'A <dfn id="concept-collection">collection</dfn> is an entity that provides a structure to some constituents that must themselves be entities. These constituents are said to be <dfn>member of</dfn> the collections. ' +
+'A <dfn id="concept-collection">collection</dfn> is an entity that provides a structure to some constituents that must themselves be entities. These constituents are said to be <dfn>member</dfn> of the collections. ' +
'</span> ' +
' ' +
' ' +
@@ -88,8 +88,8 @@
' ' +
'--> ' +
' ' +
-'<span class="glossary" id="glossary-activityAssociation"> ' +
-'An activity <dfn id="concept-activityAssociation">association</dfn> is an assignment of responsibility to an agent for an activity, indicating that the agent had a role in the activity. It further allows for a plan to be specified, which is the plan ' +
+'<span class="glossary" id="glossary-association"> ' +
+'An activity <dfn id="concept-association">association</dfn> is an assignment of responsibility to an agent for an activity, indicating that the agent had a role in the activity. It further allows for a plan to be specified, which is the plan ' +
'intended by the agent to achieve some goals in the context of this activity. ' +
'</span> ' +
' ' +
@@ -224,7 +224,7 @@
'</span> ' +
' ' +
'<span class="glossary" id="glossary-software-agent"> ' +
-'A <dfn id="concept-software-agent" title="software-agent">software agent</dfn> is running software. ' +
+'A <dfn id="concept-software-agent" title="software-agent">SoftwareAgent</dfn> is running software. ' +
'</span> ' +
' ' +
' ' +
--- a/model/prov-constraints.html Thu Nov 22 19:58:25 2012 +0100
+++ b/model/prov-constraints.html Thu Nov 22 19:59:30 2012 +0100
@@ -4694,7 +4694,7 @@
<span class="name">'agent' ∈ typeOf(ag)</span>.
<li>
<span class='conditional'>IF</span>
- <span class='name'>activity(a,attrs)</span>
+ <span class='name'>activity(a,t1,t2,attrs)</span>
<span class='conditional'>THEN</span>
<span class="name">'activity' ∈ typeOf(a)</span>.
@@ -4851,7 +4851,7 @@
<span class='name'>entity(c,[prov:type='prov:EmptyCollection'])</span>
<span class='conditional'>THEN</span>
<span class="name">'entity' ∈ typeOf(c)</span> AND
-<span class="name">'prov:Collection' ∈ typeOf(c)</span>AND
+<span class="name">'prov:Collection' ∈ typeOf(c)</span> AND
<span class="name">'prov:EmptyCollection' ∈ typeOf(c)</span>.
</ol>
--- a/model/prov-dm.html Thu Nov 22 19:58:25 2012 +0100
+++ b/model/prov-dm.html Thu Nov 22 19:59:30 2012 +0100
@@ -1506,7 +1506,7 @@
<li> component 2: derivations of entities from others;
<li> component 3: agents bearing responsibility for entities that were generated and activities that happened;
<li> component 4: bundles, a mechanism to support provenance of provenance;
-<li> component 5: properties to link entities that refer to a same thing;
+<li> component 5: properties to link entities that refer to the same thing;
<li> component 6: collections forming a logical structure for its members.
</ul>
@@ -1758,7 +1758,7 @@
This is answered by
considering that a single artifact may
correspond to several entities; in this case, a car in Boston may be a
-different entity from a car in Cambridge.
+different entity from the same car in Cambridge.
Thus, among other things,
an entity "car in Boston" would be used, and a new entity "car in
Cambridge" would be generated by this activity of driving. The
@@ -1986,7 +1986,7 @@
<p>
-<span class="glossary-ref" data-ref="glossary-activityAssociation" data-withspan="true"></span>
+<span class="glossary-ref" data-ref="glossary-association" data-withspan="true"></span>
</p>
<p>There exist no
@@ -2102,7 +2102,7 @@
<tr><td style="border-width: 0px; "></td><td>Component</td><td>Core <br>Structures</td><td>Overview</td><td>Specification</td><td>Description</td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<tr><td style=" padding: 8px;">1</td><td style="text-align: left;">Entities and Activities</td><td>✔</td><td><a href="#section-entity-activity">2.1.1</a></td><td><a href="#component1">5.1</a></td><td style="text-align: left;">about entities and activities, and their interrelations</td></tr>
-<tr><td>2</td><td style="text-align: left;">Derivation</td><td>✔</td><td><a href="#section-derivation">2.1.2</a></td><td><a href="#component3">5.2</a></td><td style="text-align: left;">about derivations and its subtypes</td></tr>
+<tr><td>2</td><td style="text-align: left;">Derivation</td><td>✔</td><td><a href="#section-derivation">2.1.2</a></td><td><a href="#component3">5.2</a></td><td style="text-align: left;">about derivation and its subtypes</td></tr>
<tr><td>3</td><td style="text-align: left;">Agent and Responsibility</td><td>✔</td><td><a href="#section-agents-attribution-association-delegation">2.1.3</a></td><td><a href="#component2">5.3</a></td><td style="text-align: left;">about agents and concepts ascribing responsibility to them</td></tr>
<tr><td>4</td><td style="text-align: left;">Bundles</td><td></td><td><a href="#section-provenance-of-provnance">2.2.2</a></td><td><a href="#component4">5.4</a></td><td style="text-align: left;">about bundles, a mechanism to support provenance of provenance</td></tr>
<tr><td>5</td><td style="text-align: left;">Alternate</td><td></td><td>—</td><td><a href="#component5">5.5</a></td><td style="text-align: left;">about relations linking entities referring the same thing</td></tr>
@@ -2276,7 +2276,7 @@
</p>
<p>
-We describe the kind of provenance record that the <a href="http://www.w3.org/Consortium">WWW Consortium</a> could keep for auditors to check that due processes are followed. All entities involved in this example are Web resources, with well-defined IRIs (some of which refer archived email messages, available to W3C Members).</p>
+We describe the kind of provenance record that the <a href="http://www.w3.org/Consortium">WWW Consortium</a> could keep for auditors to check that due processes are followed. All entities involved in this example are Web resources, with well-defined IRIs (some of which refer to archived email messages, available to W3C Members).</p>
<ul>
<li> Two versions of a document were involved: <span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111215">tr:WD-prov-dm-20111215</a></span> (second working draft) and <span class="name"><span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111018">tr:WD-prov-dm-20111018</a></span></span> (first working draft);</li>
@@ -2335,10 +2335,11 @@
</pre>
</li>
-<li>The activity was associated with the Consortium agent, and proceeded according to its publication policy: this is an <a title="concept-activityAssociation">Activity Association</a>.
+<li>The activity was associated with the Consortium agent, and proceeded according to its publication policy: this is an <a title="concept-association">Association</a>.
<pre>
wasAssociatedWith(ex:act2, w3:Consortium, process:rec-advance)
</pre>
+This relation is illustrated in <a href="#prov-a-document2-top">Figure 3</a> with a multi-edge labelled <span class="name">wasAssociatedWith</span> pointing to an agent and entity (representing a plan).
</li>
</ul>
@@ -2825,7 +2826,7 @@
<div class="anexample" id="anexample-start3">
<p>
-In this example, filling fuel was started as a consequence of
+In this example, filling the fuel tank was started as a consequence of
observing low fuel. The trigger entity is unspecified, it could
for instance have been the low fuel warning light, the fuel tank
indicator needle position, or the engine not running properly.
@@ -2901,7 +2902,7 @@
</ul>
<p>In the first two cases, the entity has physically disappeared after its termination: there is no more soup, or painting. In the third case, there may be an "offer voucher" that still exists, but it is no longer valid; likewise, on April 4th, the BBC news site still exists but it is not the same entity as BBC news Web site on April 3rd; or the
green traffic light (an entity with a fixed aspect green light) became the
-red traffic light (anohter entity with a fixed aspect red light).
+red traffic light (another entity with a fixed aspect red light).
</p>
@@ -3314,13 +3315,13 @@
<section id="term-Association">
<h4>Association</h4>
-<div class="glossary-ref" data-ref="glossary-activityAssociation"></div>
+<div class="glossary-ref" data-ref="glossary-association"></div>
<p></p>
<div class="glossary-ref" data-ref="glossary-plan"></div>
-<p><div class="attributes" id="attributes-activity-association">An <dfn title="wasAssociatedWith">activity association</dfn><span class="withPn">, written <span class="pnExpression">wasAssociatedWith(id; a, ag, pl, attrs)</span> in PROV-N,</span> has:
+<p><div class="attributes" id="attributes-activity-association">An <dfn title="wasAssociatedWith">association</dfn><span class="withPn">, written <span class="pnExpression">wasAssociatedWith(id; a, ag, pl, attrs)</span> in PROV-N,</span> has:
<ul>
<li><span class='attribute' id="association.id">id</span>: an OPTIONAL identifier for the association between an activity and an agent;</li>
<li><span class='attribute' id="association.activity">activity</span>: an identifier (<span class="name">a</span>) for the activity;</li>
@@ -3437,7 +3438,7 @@
<p>
<div class="attributes" id="attributes-influence">
-A <dfn title="wasInfluencedBy">Influence</dfn> relation<span class="withPn">, written <span class="pnExpression">wasInfluencedBy(id; o2, o1, attrs)</span> in PROV-N,</span> has:
+An <dfn title="wasInfluencedBy">Influence</dfn> relation<span class="withPn">, written <span class="pnExpression">wasInfluencedBy(id; o2, o1, attrs)</span> in PROV-N,</span> has:
<ul>
<li><span class='attribute' id="influence.id">id</span>: an OPTIONAL identifier identifying the relation;</li>
<li><span class='attribute' id="influence.influencee">influencee</span>: an identifier (<span class="name">o2</span>) for an entity, activity, or agent;
@@ -3778,7 +3779,7 @@
<div class="anexample" id="anexample-alternate2">
<p>
-Considering again the two versions of the technical report <span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111215">tr:WD-prov-dm-20111215</a></span> (second working draft) and <span class="name"><span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111018">tr:WD-prov-dm-20111018</a></span></span> (first working draft). They are alternate of each other.
+Considering again the two versions of the technical report <span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111215">tr:WD-prov-dm-20111215</a></span> (second working draft) and <span class="name"><span class="name"><a href="http://www.w3.org/TR/2011/WD-prov-dm-20111018">tr:WD-prov-dm-20111018</a></span></span> (first working draft). They are alternates of each other.
<pre class="codeexample">
entity(tr:WD-prov-dm-20111018)
entity(tr:WD-prov-dm-20111215)
@@ -3841,7 +3842,7 @@
<section id="term-membership">
<h3>Membership</h3>
-<p>A <strong>membership</strong> relation is defined, to allow stating the members of a Collection. </p>
+<p>A <strong>membership</strong> relation is defined the members of a Collection to be stated. </p>
<span class="glossary-ref" data-ref="glossary-membership"></span>
--- a/model/prov-glossary.html Thu Nov 22 19:58:25 2012 +0100
+++ b/model/prov-glossary.html Thu Nov 22 19:59:30 2012 +0100
@@ -132,7 +132,7 @@
<p style="font-size: 200%;">A</a>
<div class="glossary-ref" data-ref="glossary-activity"></div><p></p>
-<div class="glossary-ref" data-ref="glossary-activityAssociation"></div><p></p>
+<div class="glossary-ref" data-ref="glossary-association"></div><p></p>
<div class="glossary-ref" data-ref="glossary-agent"></div><p></p>
<div class="glossary-ref" data-ref="glossary-alternate"></div><p></p>
<div class="glossary-ref" data-ref="glossary-attribution"></div><p></p>