--- a/model/glossary.html Wed Mar 21 21:16:21 2012 +0000
+++ b/model/glossary.html Wed Mar 21 22:14:19 2012 +0000
@@ -53,7 +53,7 @@
<span class="glossary" id="glossary-responsibility">
-For an agent, <dfn id="concept-responsibility">responsibility</dfn> is the fact of being accountable
+ <dfn id="concept-responsibility">Responsibility</dfn> is the fact that an agent is accountable
for the actions of a "subordinate" agent, in the context of an activity.
</span>
@@ -138,3 +138,8 @@
</span>
</html>
+<span class="glossary" id="glossary-traceability">
+<dfn id="concept-traceability">Traceability</dfn> is the ability to link back an entity to another by means of derivation or responsibility relations, possibly repeatedly traversed.
+</span>
+
+
--- a/model/glossary.js Wed Mar 21 21:16:21 2012 +0000
+++ b/model/glossary.js Wed Mar 21 22:14:19 2012 +0000
@@ -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/966bb518d2b9/model/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/b3f7be492a4b/model/glossary.html';
glossary_string=
' ' +
'<html> ' +
@@ -60,7 +60,7 @@
' ' +
' ' +
'<span class="glossary" id="glossary-responsibility"> ' +
-'For an agent, <dfn id="concept-responsibility">responsibility</dfn> is the fact of being accountable ' +
+' <dfn id="concept-responsibility">Responsibility</dfn> is the fact that an agent is accountable ' +
'for the actions of a "subordinate" agent, in the context of an activity. ' +
'</span> ' +
' ' +
@@ -145,4 +145,9 @@
'</span> ' +
'</html> ' +
' ' +
+'<span class="glossary" id="glossary-traceability"> ' +
+'<dfn id="concept-traceability">Traceability</dfn> is the ability to link back an entity to another by means of derivation or responsibility relations, possibly repeatedly traversed. ' +
+'</span> ' +
+' ' +
+' ' +
' ' ;
--- a/model/working-copy/wd5-prov-dm-components.html Wed Mar 21 21:16:21 2012 +0000
+++ b/model/working-copy/wd5-prov-dm-components.html Wed Mar 21 22:14:19 2012 +0000
@@ -934,11 +934,13 @@
<section id="component1">
<h3>Component 1: Entities and Activities</h3>
+<p>The first component of PROV-DM is concerned with <a title="entity">entities</a> and <a title="activity">activities</a>, and their inter-relations: <a>Usage</a>, <a>Generation</a>, <a>Start</a>, <a>End</a>, <a>Communication</a>, and <a>Start by Activity</a>. Figure <a href="#figure-component1">figure-component1</a> overviews the first component, with two classes and binary associations between them. Associations are not just binary; indeed, <a>Usage</a>, <a>Generation</a>, <a>Start</a>, <a>End</a> are remarkable because they have <em>time</em> attributes, which are placeholders for time information related to provenance.
+</p>
<div style="text-align: center;">
<figure>
<img src="../images/Entities-Activities.png" alt="entities and activities"/>
-<figcaption>Entities and Activities Component Overview</figcaption>
+<figcaption id="figure-component1">Entities and Activities Component Overview</figcaption>
</figure>
</div>
@@ -1286,12 +1288,16 @@
<section id="component2">
<h3>Component 2: Agents and Responsibility</h3>
+<p>The second component of PROV-DM is concerned with <a title="agent">agents</a> and the notions of
+<a>Attribution</a>, <a>Association</a>, <a>Responsibility</a>, relating agents to entities, activities, and agents, respectively.
+Figure <a href="#figure-component2">figure-component2</a> overviews the second component, with three classes (Entity, Activity, and Agent) and associations between them. So-called "association classes" are used to express ternary relations.
+</p>
<div style="text-align: center;">
<figure>
<img src="../images/Agents-Responsibility.png" alt="agents and responsibilities"/>
-<figcaption>Agents and Responsibilities Component Overview</figcaption>
+<figcaption id="figure-component2">Agents and Responsibilities Component Overview</figcaption>
</figure>
</div>
@@ -1489,21 +1495,27 @@
<section id="component3">
<h3>Component 3: Derivations</h3>
-<section id="Derivation-Relation">
+
+
+<p>The third component of PROV-DM is concerned with <a title="derivation">derivations</a> between <a title="entity">entities</a>, and subtypes of derivations <a>Revision</a>, <a>Quotation</a>, <a>Original Source</a>, and <a>Traceability</a>.
+Figure <a href="#figure-component3">figure-component3</a> overviews the third component, with three classes (Entity, Activity, and Agent) and associations between them. So-called "association classes" are used to express n-ary relations.
+</p>
<div style="text-align: center;">
<figure>
<img src="../images/Derivation.png" alt="derivation"/>
-<figcaption>Derivation Component Overview</figcaption>
+<figcaption id="figure-component3">Derivation Component Overview</figcaption>
</figure>
</div>
+<section id="Derivation-Relation">
<h4>Derivation</h4>
+
<div class="glossary-ref" ref="glossary-derivation"></div>
@@ -1679,12 +1691,17 @@
<section id="term-traceability">
<h3>Traceability</h3>
-<p> A <dfn title="dfn-Traceability">traceability relation</dfn> between two entities <span class="name">e2</span> and <span class="name">e1</span> is a generic dependency of <span class="name">e2</span>
-on <span class="name">e1</span> that indicates either that <span class="name">e1</span> was necessary for <span class="name">e2</span> to be created, or that <span class="name">e1</span> bears
+<p>
+<span class="glossary-ref" ref="glossary-traceability"></span>
+</p>
+
+
+<p> A traceability relation between two entities <span class="name">e2</span> and <span class="name">e1</span> is a generic dependency of <span class="name">e2</span>
+on <span class="name">e1</span> that indicates either that <span class="name">e1</span> may have been necessary for <span class="name">e2</span> to be created, or that <span class="name">e1</span> bears
some responsibility for <span class="name">e2</span>'s existence.
-<p> A <dfn title="tracedTo">traceability relation</dfn><span class="withPn">, written <span class="pnExpression">tracedTo(id,e2,e1,attrs)</span> in PROV-N,</span> contains:</p>
+<p><dfn title="tracedTo">Traceability</dfn><span class="withPn">, written <span class="pnExpression">tracedTo(id,e2,e1,attrs)</span> in PROV-N,</span> contains:</p>
<ul>
<li><span class='attribute' id="traceability.id">id</span>: an OPTIONAL identifier identifying the relation;</li>
<li><span class='attribute' id="traceability.entity">entity</span>: an identifier identifying an entity;
@@ -1706,7 +1723,7 @@
<p>
-<a href="#Derivation-Relation">Derivation</a> and association are particular cases of traceability.
+<a>Derivation</a> and <a>association</a> are particular cases of traceability.
</p>
@@ -1718,10 +1735,15 @@
<h3>Component 4: Alternate Entities</h3>
+<p>The fourth component of PROV-DM is concerned with relations <a>alternate</a> and <a>specialization</a> between entities.
+Figure <a href="#figure-component4">figure-component4</a> overviews the component.
+</p>
+
+
<div style="text-align: center;">
<figure>
<img src="../images/Alternates.png" alt="alternates"/>
-<figcaption>Alternates Component Overview</figcaption>
+<figcaption id="figure-component4">Alternates Component Overview</figcaption>
</figure>
</div>
@@ -2118,6 +2140,10 @@
<section id="component6">
<h3>Component 6: Annotations</h3>
+<p>The sixth component of PROV-DM is concerned with <a title="note">notes</a> and <a title="annotation">annotations</a>.
+</p>
+
+
<section id="term-note">
<h4>Note</h4>
@@ -2412,58 +2438,6 @@
</section>
-<section id="data-model-concepts">
-
-<h2>OLD Introductory Material PROV-DM Concepts</h2>
-
-<p>In this section, we revisit each concept introduced in <a href="'#conceptualization'">Section 2</a>, and provide its detailed definition in the PROV data model, in terms of its various constituents. </p>
-
-<p>In PROV-DM, we distinguish elements from relations, which are respectively discussed in
-<a href="'#term-element'">Section 4.1</a> and <a href="'#term-relation'">Section 4.2</a>.</p>
-
-
-
-
-
-
-
-
-
-
-
-
-p
-<section id="common-relations">
-<h2>Figures on PROV-DM Common Relations</h2>
-
-<p>The following figure summarizes the additional relations described in this section.
-</p>
-
-<div style="text-align: center;">
-<figure>
-<img src="images/commonRelations.svg" alt="common relations"/>
-<figcaption>PROV-DM Common Relations</figcaption>
-</figure>
-</div>
-
-
-
-
-
-
-
-
-
-
-</section>
-
-
-
-
-
-
-</section>
-
<!-- end sec. 5 -->
<section id="extensibility-section">