--- a/model/glossary.html Thu Jun 28 20:13:55 2012 +0100
+++ b/model/glossary.html Thu Jun 28 21:16:23 2012 +0100
@@ -12,7 +12,7 @@
</span>
<span class="glossary" id="glossary-agent">
-An <dfn id="concept-agent">agent</dfn> is something that bears some form of responsibility for an activity taking place or for the existence of an entity.
+An <dfn id="concept-agent">agent</dfn> is something that bears some form of responsibility for an activity taking place, for the existence of an entity, or for another agent's activity.
</span>
<span class="glossary" id="glossary-generation">
@@ -26,7 +26,7 @@
</span>
<span class="glossary" id="glossary-derivation">
-A <dfn id="concept-derivation">derivation</dfn> is a transformation of an entity into another, an update of an entity resulting in a new one, or the construction of a new entity based on a pre-exisiting entity.</span>
+A <dfn id="concept-derivation">derivation</dfn> is a transformation of an entity into another, an update of an entity resulting in a new one, or the construction of a new entity based on a pre-existing entity.</span>
--- a/model/glossary.js Thu Jun 28 20:13:55 2012 +0100
+++ b/model/glossary.js Thu Jun 28 21:16:23 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/8ef8cc423807/model/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/49acfc0a4219/model/glossary.html';
glossary_string=
' ' +
'<html> ' +
@@ -19,7 +19,7 @@
'</span> ' +
' ' +
'<span class="glossary" id="glossary-agent"> ' +
-'An <dfn id="concept-agent">agent</dfn> is something that bears some form of responsibility for an activity taking place or for the existence of an entity. ' +
+'An <dfn id="concept-agent">agent</dfn> is something that bears some form of responsibility for an activity taking place, for the existence of an entity, or for another agent\'s activity. ' +
'</span> ' +
' ' +
'<span class="glossary" id="glossary-generation"> ' +
@@ -33,7 +33,7 @@
'</span> ' +
' ' +
'<span class="glossary" id="glossary-derivation"> ' +
-'A <dfn id="concept-derivation">derivation</dfn> is a transformation of an entity into another, an update of an entity resulting in a new one, or the construction of a new entity based on a pre-exisiting entity.</span> ' +
+'A <dfn id="concept-derivation">derivation</dfn> is a transformation of an entity into another, an update of an entity resulting in a new one, or the construction of a new entity based on a pre-existing entity.</span> ' +
' ' +
' ' +
' ' +
--- a/model/prov-dm.html Thu Jun 28 20:13:55 2012 +0100
+++ b/model/prov-dm.html Thu Jun 28 21:16:23 2012 +0100
@@ -1494,7 +1494,7 @@
<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a title="dfn-Activity" class="essential">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
<tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a title="WasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a></td></tr>
<tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a title="used"><span class="essential">used(</span>id;<span class="essential">a,e</span>,t,attrs<span class="essential">)</span></a></td></tr>
-<tr class="component1-color"><td class="essential"><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy(id;a2,a1,attrs)</a></td></tr>
+<tr class="component1-color"><td class="essential"><a>Communication</a></td><td><a title="wasInformedBy"><span class="essential">wasInformedBy(</span>id;<span class="essential">a2,a1</span>,attrs<span class="essential">)</span></a></td></tr>
<tr class="component1-color"><td><a>Start</a></td><td><a title="wasStartedBy">wasStartedBy(id;a2,e,a1,t,attrs)</a></td></tr>
<tr class="component1-color"><td><a>End</a></td><td><a title="wasEndedBy">wasEndedBy(id;a2,e,a1,t,attrs)</a></td></tr>
<tr class="component1-color"><td><a>Invalidation</a></td><td><a title="wasInvalidatedBy">wasInvalidatedBy(id;e,a,t,attrs)</a></td></tr>
@@ -1524,8 +1524,8 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<tr class="component5-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td rowspan="3"><a href="#component4">Component 5: Alternate</a></td></tr>
-<tr class="component5-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super,bundle)</a></td></tr>
-<tr class="component5-color"><td><a>Mention</a></td><td><a title="mentionOf">mentionOf(e2, e1,bundle)</a></td></tr>
+<tr class="component5-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(infra, supra)</a></td></tr>
+<tr class="component5-color"><td><a>Mention</a></td><td><a title="mentionOf">mentionOf(infra, supra,bundle)</a></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
@@ -1921,7 +1921,7 @@
agent(ex:Picasso)
wasAttributedTo(ex:The-Painter, ex:Picasso)
activity(ex:crash)
-wasInvalidatedBy(ex:The-Painter, ex:crash, 1998-09-02, [ ex:circumstances="plane accident" ])
+wasInvalidatedBy(ex:The-Painter, ex:crash, 1998-09-03T01:31:00, [ ex:circumstances="plane accident" ])
</pre>
</div>
@@ -2096,7 +2096,9 @@
<pre class="codeexample">
entity(tr:WD-prov-dm-20111215, [ prov:type='rec54:WD' ])
entity(tr:WD-prov-dm-20111018, [ prov:type='rec54:WD' ])
-wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ prov:type='prov:Revision' ])
+wasDerivedFrom(tr:WD-prov-dm-20111215,
+ tr:WD-prov-dm-20111018,
+ [ prov:type='prov:Revision' ])
</pre>
</div>
@@ -2518,6 +2520,8 @@
</ul>
<p>A bundle's identifier <span class="name">id</span> identifies a unique set of descriptions.</p>
</div>
+
+<p>There may be other kinds of bundles not directly expressible by this constructor, such as napkin, whiteboard, etc. What ever the means by which bundles are expressed, all can be described, as in the following section.</p>
</section>
@@ -2858,9 +2862,12 @@
is an alternate of a
<a href="http://www.bbc.co.uk/news/mobile/science-environment-17526723">bbc:news/mobile/science-environment-17526723</a> for mobile devices.</p>
<pre class="codeexample">
-entity(bbc:news/science-environment-17526723, [ prov:type="a news item for desktop"])
-entity(bbc:news/mobile/science-environment-17526723, [ prov:type="a news item for mobile devices"])
-alternateOf(bbc:news/science-environment-17526723, bbc:news/mobile/science-environment-17526723)
+entity(bbc:news/science-environment-17526723,
+ [ prov:type="a news item for desktop"])
+entity(bbc:news/mobile/science-environment-17526723,
+ [ prov:type="a news item for mobile devices"])
+alternateOf(bbc:news/science-environment-17526723,
+ bbc:news/mobile/science-environment-17526723)
</pre>
</div>
@@ -3110,7 +3117,7 @@
<div style="text-align: center;">
-<figure>
+<figure style="max-width: 95%; ">
<img src="uml/component6.png" alt="collection"/>
<figcaption id="figure-component6">Figure 10: Collections Component Overview</figcaption>
@@ -3447,7 +3454,7 @@
-<p id="conformance-to-rdf-datatypes"><b>Conformance to RDF Datatypes</b> As of the publication of this document, RDF 1.1 Concepts and Abstract Syntax is not yet a W3C Recommendation (see <a href="http://www.w3.org/TR/rdf11-concepts/">http://www.w3.org/TR/rdf11-concepts/</a> for the latest version).
+<p id="conformance-to-rdf-datatypes"><b>Conformance to RDF Datatypes</b> As of the publication of this document, RDF 1.1 Concepts and Abstract Syntax [[RDF-CONCEPTS11]] is not yet a W3C Recommendation (see <a href="http://www.w3.org/TR/rdf11-concepts/">http://www.w3.org/TR/rdf11-concepts/</a> for the latest version).
Both the PROV Working Group and the RDF Working Group are confident that there will be only minor changes before it becomes a W3C Recommendation. In order to take advantage of the anticipated corrections and new features sooner, while also providing stability in case the specification does not advance as expected, conformance to PROV as it relates to RDF Datatypes is defined as follows:</p>
<ul>