--- a/model/glossary.html Thu Jun 14 12:50:49 2012 +0100
+++ b/model/glossary.html Mon Jun 18 17:11:44 2012 +0100
@@ -114,7 +114,7 @@
</span>
<span class="glossary" id="glossary-event">
-oAn <em>instantaneous event</em>, or <dfn id="concept-event">event</dfn> for short, happens in the world and marks a change in the world, in its
+An <em>instantaneous event</em>, or <dfn id="concept-event">event</dfn> for short, happens in the world and marks a change in the world, in its
activities and in its entities.
</span>
--- a/model/glossary.js Thu Jun 14 12:50:49 2012 +0100
+++ b/model/glossary.js Mon Jun 18 17:11:44 2012 +0100
@@ -121,7 +121,7 @@
'</span> ' +
' ' +
'<span class="glossary" id="glossary-event"> ' +
-'oAn <em>instantaneous event</em>, or <dfn id="concept-event">event</dfn> for short, happens in the world and marks a change in the world, in its ' +
+'An <em>instantaneous event</em>, or <dfn id="concept-event">event</dfn> for short, happens in the world and marks a change in the world, in its ' +
'activities and in its entities. ' +
'</span> ' +
' ' +
--- a/model/prov-dm.html Thu Jun 14 12:50:49 2012 +0100
+++ b/model/prov-dm.html Mon Jun 18 17:11:44 2012 +0100
@@ -541,8 +541,8 @@
<li> component 1: entities and activities, and the time at which they were created, used, or ended;
<li> component 2: agents bearing responsibility for entities that were generated and activities that happened;
<li> component 3: derivations of entities from others;
-<li> component 4: properties to link entities that refer to a same thing;
-<li> component 5: bundles, a mechanism to support provenance of provenance;
+<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 6: collections forming a logical structure for its members.
</ul>
@@ -1426,8 +1426,8 @@
<li><b>Component 1: entities and activities.</b> The first component consists of entities, activities, and concepts linking them, such as generation, usage, start, end. The first component is the only one comprising time-related concepts. </li>
<li><b>Component 2: agents and responsibility.</b> The second component consists of agents and concepts ascribing responsibility to agents.</li>
<li><b>Component 3: derivations.</b> The third component is formed with derivations and derivation subtypes.</li>
-<li><b>Component 4: alternate.</b> The fourth component consists of relations linking entities referring to the same thing. </li>
-<li><b>Component 5: bundles.</b> The fifth component is concerned with bundles, a mechanism to support provenance of provenance.</li>
+<li><b>Component 4: bundles.</b> The fourth component is concerned with bundles, a mechanism to support provenance of provenance.</li>
+<li><b>Component 5: alternate.</b> The fifth component consists of relations linking entities referring to the same thing. </li>
<li><b>Component 6: collections.</b> The sixth component is about collections and concepts capturing their transformation, such as insertion and removal. </li>
</ul>
</div>
--- a/presentations/ipaw-2012/prov-dm/overview/index.html Thu Jun 14 12:50:49 2012 +0100
+++ b/presentations/ipaw-2012/prov-dm/overview/index.html Mon Jun 18 17:11:44 2012 +0100
@@ -141,6 +141,10 @@
$('#divs_div').html(divs_string)
updateGlossaryRefs();
updateOtherRefs();
+
+ $('#glossary_div').html("")
+ $('#divs_div').html("")
+
});
</script>
@@ -433,7 +437,7 @@
<img src="images/w3c-publication-derivation.svg" alt="PROV-DM overview" style="max-width: 99%; " />
-<span class="pnExpression">wasDerivedFrom(tr:WD-prov-dm-20111215,tr:WD-prov-dm-20111018)</span><br>
+<span class="pnExpression">wasDerivedFrom(tr:WD-prov-dm-20111215,tr:WD-prov-dm-20111018, [ prov:type='prov:WasRevisionOf' ] )</span><br>
@@ -468,7 +472,7 @@
<div class="slide" id="overview-diagram">
- <h2>PROV Data Model Structure</h2>
+ <h2>PROV Data Model Core</h2>
<img src="uml/essentials.png" alt="PROV-DM overview" style="max-width: 150%; width: 80%; " />
@@ -883,6 +887,16 @@
+</div>
+
+
+<div class="slide" id="bundle-example">
+
+
+ <h2>Bundle Example</h2>
+
+
+
<p>
<div class="element-ref" ref="anexample-provenance-of-provenance">
</div>
@@ -899,7 +913,6 @@
-
<!-- PART II Alternates -->
<div class="slide" id="component5">
@@ -989,6 +1002,20 @@
</p>
+
+
+<div class="note" id="responsibility.note">
+<p>some note here</p>
+</div>
+
+</div>
+
+<div class="slide" id="contextualization-example">
+
+
+ <h2>Contextualization Example</h2>
+
+
<p>
<div class="element-ref" ref="anexample-contextualization1">
</div>
@@ -1358,7 +1385,7 @@
<td><a href="http://www.w3.org/TR/prov-aq/">http://www.w3.org/TR/prov-aq/</a></td></tr>
<tr><td>prov-sem</td>
- <td>Work in progress</td></tr>
+ <td>work in progress</td></tr>
<tr><td>prov-xml</td>
<td>work in progress</td></tr>
@@ -1392,7 +1419,7 @@
<div id="glossary_div" class="remove">
-<!-- glossary loaded from glossary.js will be hooked up here,
+<p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><p><!-- glossary loaded from glossary.js will be hooked up here,
class remove, will remove this element from the final output.
-->
</div>