--- a/model/glossary.html Wed Jun 06 11:43:06 2012 +0100
+++ b/model/glossary.html Wed Jun 06 13:11:21 2012 +0100
@@ -127,8 +127,8 @@
someone who may or may not be its original author.
</span>
-<span class="glossary" id="glossary-original-source">
-An <dfn id="concept-original-source">original source</dfn> refers to the
+<span class="glossary" id="glossary-primary-source">
+A <dfn id="concept-primary-source">primary source</dfn> refers to the
source material that is closest to the person, information, period, or idea being studied.
</span>
--- a/model/glossary.js Wed Jun 06 11:43:06 2012 +0100
+++ b/model/glossary.js Wed Jun 06 13:11:21 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/51c9b9141a25/model/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/8526c8e4d8bc/model/glossary.html';
glossary_string=
' ' +
'<html> ' +
@@ -134,8 +134,8 @@
'someone who may or may not be its original author. ' +
'</span> ' +
' ' +
-'<span class="glossary" id="glossary-original-source"> ' +
-'An <dfn id="concept-original-source">original source</dfn> refers to the ' +
+'<span class="glossary" id="glossary-primary-source"> ' +
+'A <dfn id="concept-primary-source">primary source</dfn> refers to the ' +
'source material that is closest to the person, information, period, or idea being studied. ' +
'</span> ' +
' ' +
--- a/model/prov-dm.html Wed Jun 06 11:43:06 2012 +0100
+++ b/model/prov-dm.html Wed Jun 06 13:11:21 2012 +0100
@@ -1373,7 +1373,7 @@
<caption id="relations-at-a-glance">Table 4: PROV-DM Relations At a Glance</caption>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="3">Object</td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td>Entity</td><td>Activity</td><td>Agent</td></tr>
-<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component2-color"><a class="essential">WasDerivedFrom</a><br><a>WasRevisionOf</a><br><a>WasQuotedFrom</a><br><a>HadOriginalSource</a></div><div class="component4-color"><a>AlternateOf</a><br><a>SpecializationOf</a></div></td><td class="component1-color"><a class="essential"
+<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component2-color"><a class="essential">WasDerivedFrom</a><br><a>WasRevisionOf</a><br><a>WasQuotedFrom</a><br><a>HadPrimarySource</a></div><div class="component4-color"><a>AlternateOf</a><br><a>SpecializationOf</a></div></td><td class="component1-color"><a class="essential"
title="wasGeneratedBy">WasGeneratedBy</a><br><a
title="wasInvalidatedBy">WasInvalidatedBy</a></td><td class="component3-color"><a class="essential">WasAttributedTo</a></td></tr>
<tr><td>Activity</td><td><div class="component1-color"><a class="essential">Used</a><br><a>WasStartedBy</a><br><a>WasEndedBy</a></div></td><td class="component1-color"><a class="essential">WasInformedBy</a></td><td class="component3-color"><a class="essential">WasAssociatedWith</a></td></tr>
@@ -1404,7 +1404,7 @@
<tr class="component2-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td rowspan="5"><a href="#component2">Component 2: Derivations</a></td></tr>
<tr class="component2-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
<tr class="component2-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></td></tr>
-<tr class="component2-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
+<tr class="component2-color"><td class="provType"><a>Primary Source</a></td><td><a title="Primary Source">... prov:type='prov:HadPrimarySource' ...</a></td></tr>
<tr class="component2-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
@@ -1888,7 +1888,7 @@
-<p>The third component of PROV-DM is concerned with: <a title="derivation">derivations</a> of <a title="entity">entities</a> from others; derivation subtypes <a>Revision</a>, <a>Quotation</a>, and <a>Original Source</a>; derivation-related <a>Trace</a>.
+<p>The third component of PROV-DM is concerned with: <a title="derivation">derivations</a> of <a title="entity">entities</a> from others; derivation subtypes <a>Revision</a>, <a>Quotation</a>, and <a>Primary Source</a>; derivation-related <a>Trace</a>.
<a href="#figure-component2">Figure 6</a> depicts the third component
with PROV core structures in the yellow area, including two classes
(<a>Entity</a>, <a>Activity</a>) and binary association
@@ -2054,17 +2054,17 @@
</section> <!-- end quotation -->
-<section id="term-original-source">
-<h3>Original Source</h3>
+<section id="term-primary-source">
+<h3>Primary Source</h3>
<p>
-<span class="glossary-ref" data-ref="glossary-original-source"></span>
+<span class="glossary-ref" data-ref="glossary-primary-source"></span>
</p>
-<p>An <dfn>original source</dfn> relation is a particular case of <a>derivation</a>
+<p>A <dfn>primary source</dfn> relation is a particular case of <a>derivation</a>
that aims to give
credit to the source that originated some information. It is recognized that it may be
-hard to determine which entity constitutes an original source. This definition is inspired by
+hard to determine which entity constitutes a primary source. This definition is inspired by
<span class="name">original-source</span> as defined in
<a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html">http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html</a>.</p>
@@ -2082,18 +2082,18 @@
-->
<div class="anexample">
<p>
-Let us consider the concept introduced in the current section, identified as <a title="original source"><span class="name">dm:concept-original-source</span></a>, and
+Let us consider the concept introduced in the current section, identified as <a title="primary source"><span class="name">dm:concept-primary-source</span></a>, and
the Google page <a href="http://googlenewsblog.blogspot.com/2010/11/credit-where-credit-is-due.html"><span class="name">go:credit-where-credit-is-due.html</span></a>, where the notion original-source was originally described (to the knowledge of the authors).
<pre class="codeexample">
-entity(dm:concept-original-source)
+entity(dm:concept-primary-source)
entity(go:credit-where-credit-is-due.html)
-wasDerivedFrom(dm:concept-original-source, go:credit-where-credit-is-due.html,
- [ prov:type='prov:HadOriginalSource' ])
+wasDerivedFrom(dm:concept-primary-source, go:credit-where-credit-is-due.html,
+ [ prov:type='prov:HadPrimarySource' ])
</pre>
</div>
-</section> <!-- end original source -->
+</section> <!-- end primary source -->
</section>
@@ -2970,7 +2970,7 @@
<span class="glossary-ref" data-ref="glossary-membership"></span>
<p>
-The insertion and removal relations make insertions and removals explicit as part of the history of a dictionary. This, however, requires explicit reference to the dictionary prior to each operation. The membership relation removes this need, allowing the membership of a dictionary to be expressed without having to introduce a prior dictionary.</p>
+The insertion and removal relations make insertions and removals explicit as part of the history of a dictionary. This, however, requires explicit reference to the dictionary that existed prior to each operation. The membership relation removes this need, allowing the membership of a dictionary to be expressed without having to introduce a prior dictionary.</p>
<p>
<div class="attributes" id="attributes-memberOf">