--- a/model/diff.html Tue Sep 25 12:28:30 2012 +0100
+++ b/model/diff.html Tue Sep 25 12:31:37 2012 +0100
@@ -2112,12 +2112,32 @@
The letter 'T' indicates an <em class="rfc2119" title="optional">optional</em> <a title="time" href="#dfn-time" class="internalDFN">time</a> is also permitted.
</p>
-<p><a href="#prov-dm-types-and-relations">Table 5</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to. In the first column, concept names link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold <span class="insert">in the first column </span>are the core structures introduced in <a href="#core-structures">Section 2.1</a>.<span class="insert"> Likewise, these core structures have their names and parameters highlighted in bold in the second column (prov-n representation); expanded structures are not represented with a bold font.</span></p>
+
+
+
+<p><span class="insert">
+Some PROV-DM relations are not binary and involve extra optional element. They are summarized in </span><a href="#secondary-elements-relations-at-a-glance-div"><span class="insert">Table 5</span></a><span class="insert"> grouping secondary objects, according to their type. The table also adopts the same color scheme as </span><a href="#prov-dm-components"><span class="insert">Figure 4</span></a><span class="insert">, allowing components to be readily identified. None of these associations correspond to the core structures introduced
+in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert">.</span></p>
+
+
+<div id="secondary-elements-relations-at-a-glance-div" style="text-align: center;">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="secondary-elements-relations-at-a-glance"><span><span class="insert">Table 5</span><sup><a class="internalDFN" href="#secondary-elements-relations-at-a-glance"><span class="diamond"><span class="insert"> ◊:</span></span></a></sup> </span><span class="insert">Secondary optional elements in PROV-DM Relations</span></caption>
+<tbody><tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="6"><span class="insert">Secondary Object</span></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td><span class="insert">Entity</span></td><td><span class="insert">Activity</span></td><td><span class="insert">Agent</span></td></tr>
+<tr><td rowspan="3"><span class="insert">Subject</span></td><td><span class="insert">Entity</span></td><td class="component5-color"><a href="#dfn-mentionof" class="internalDFN"><span class="insert">MentionOf</span></a><span class="insert"> (bundle)</span></td><td class="component2-color"><a href="#dfn-wasderivedfrom" class="internalDFN"><span class="insert">WasDerivedFrom</span></a><span class="insert"> (activity)</span><br><a><span class="insert">Revision (activity)</span></a><br><a><span class="insert">Quotation (activity)</span></a><br><a><span class="insert">PrimarySource (activity)</span></a></td><td colspan="2"><span class="insert">—</span></td></tr>
+<tr><td><span class="insert">Activity</span></td><td class="component3-color"><a href="#dfn-wasassociatedwith" class="internalDFN"><span class="insert">WasAssociatedWith</span></a><span class="insert"> (plan)</span></td><td class="component1-color"><a href="#dfn-wasstartedby" class="internalDFN"><span class="insert">WasStartedBy</span></a><span class="insert"> (starter)</span><br><a href="#dfn-wasendedby" class="internalDFN"><span class="insert">WasEndedBy</span></a><span class="insert"> (ender)</span></td><td colspan="2"><span class="insert">—</span></td></tr>
+<tr><td><span class="insert">Agent</span></td><td><span class="insert">—</span></td><td class="component3-color"><a href="#dfn-actedonbehalfof" class="internalDFN"><span class="insert">ActedOnBehalfOf</span></a><span class="insert"> (activity)</span></td><td><span class="insert">—</span></td></tr>
+</tbody></table>
+</div>
+
+
+<p><a href="#prov-dm-types-and-relations">Table <span class="delete">5</span><span class="insert">6</span></a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to. In the first column, concept names link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold <span class="insert">in the first column </span>are the core structures introduced in <a href="#core-structures">Section 2.1</a>.<span class="insert"> Likewise, these core structures have their names and parameters highlighted in bold in the second column (prov-n representation); expanded structures are not represented with a bold font.</span></p>
<div id="prov-dm-types-and-relations-fig" style="text-align: left;">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-types-and-relations"><span>Table 5<sup><a class="internalDFN" href="#prov-dm-types-and-relations"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Types and Relations</caption>
+<caption id="prov-dm-types-and-relations"><span>Table <span class="delete">5</span><span class="insert">6</span><sup><a class="internalDFN" href="#prov-dm-types-and-relations"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Types and Relations</caption>
<tbody><tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b>Component</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
@@ -3547,7 +3567,7 @@
<div id="attributes-at-a-glance-divz" style="text-align: left;">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="attributes-at-a-glance"><span>Table 6<sup><a class="internalDFN" href="#attributes-at-a-glance"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Attributes At a Glance</caption>
+<caption id="attributes-at-a-glance"><span>Table <span class="delete">6</span><span class="insert">7</span><sup><a class="internalDFN" href="#attributes-at-a-glance"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Attributes At a Glance</caption>
<tbody><tr><td><b>Attribute</b></td><td><b>Allowed In</b></td><td><b>value</b></td><td><b>Section</b></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></tr>
<tr><td><a title="label" href="#concept-label" class="internalDFN">prov:label</a></td><td><em>any construct</em></td><td>A <a href="#concept-value" class="internalDFN">Value</a> of type <a class="section-ref" href="http://www.w3.org/TR/xmlschema11-2/#string">xsd:string</a></td><td><a class="section-ref" href="#term-attribute-label"><span>Section 5.7.2.1</span></a> </td></tr>
@@ -3646,7 +3666,7 @@
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-predefined-types"><span>Table 7<sup><a class="internalDFN" href="#prov-dm-predefined-types"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Predefined Types</caption>
+<caption id="prov-dm-predefined-types"><span>Table <span class="delete">7</span><span class="insert">8</span><sup><a class="internalDFN" href="#prov-dm-predefined-types"><span class="diamond"> ◊:</span></a></sup> </span>PROV-DM Predefined Types</caption>
<tbody><tr><td><b>Type</b></td><td><b>Specification</b></td><td><b>Core concept</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<tr><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="name">prov:Bundle</span></a></td><td><a class="section-ref" href="#term-bundle"><span>Section 5.4.1</span></a></td><td><a href="#concept-entity" class="internalDFN">Entity</a></td></tr>
@@ -3927,7 +3947,7 @@
<div id="prov-dm-to-prov-o-and-prov-n-fig" style="text-align: left;">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-to-prov-o-and-prov-n"><span>Table 8<sup><a class="internalDFN" href="#prov-dm-to-prov-o-and-prov-n"><span class="diamond"> ◊:</span></a></sup> </span>Cross-References to PROV-O and PROV-N</caption>
+<caption id="prov-dm-to-prov-o-and-prov-n"><span>Table <span class="delete">8</span><span class="insert">9</span><sup><a class="internalDFN" href="#prov-dm-to-prov-o-and-prov-n"><span class="diamond"> ◊:</span></a></sup> </span>Cross-References to PROV-O and PROV-N</caption>
<tbody><tr><td><a><b>PROV-DM</b></a></td><td><b>PROV-O</b></td><td><b>PROV-N</b></td><td><b>Component</b></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></tr>
@@ -4142,6 +4162,7 @@
</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/492"><span class="insert">ISSUE-492</span></a><span class="insert">: Fixed typos in </span><a href="#anexample-invalidation3" class="anexample-ref"><span><span class="insert">Example 29</span></span></a><span class="insert">.
</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/508"><span class="insert">ISSUE-508</span></a><span class="insert">: Clarified the bold names and parameters in text preceding </span><a href="#prov-dm-types-and-relations-fig"><span class="insert">Table 5</span></a><span class="insert">.
</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/501"><span class="insert">ISSUE-501</span></a><span class="insert">: Put the example about driving a car to Boston in a box.
+</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/450"><span class="insert">ISSUE-450</span></a><span class="insert">, </span><a href="http://www.w3.org/2011/prov/track/issues/514"><span class="insert">ISSUE-514</span></a><span class="insert">: added table with secondary objects in relations.
</span></li></ul>
</div>