--- a/ontology/ProvenanceFormalModel.html Wed Aug 17 12:55:55 2011 +0100
+++ b/ontology/ProvenanceFormalModel.html Wed Aug 17 13:47:31 2011 +0100
@@ -100,9 +100,9 @@
<section>
<h3>Visualization of the Provenance ontology</h3>
<h4>Hierarchical view of the ontology</h4>
- <img src="diagram-history\DGarijoDiagrams\HierarchicalDiagram.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/8/80/InitialDiagram.png" />
<h4>Overview of the ontology</h4>
- <img src="diagram-history\DGarijoDiagrams\GlobalSchema.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/a/ad/GlobalSchema.png" />
</section>
<section>
<h3>Classes</h3>
@@ -174,18 +174,18 @@
<h4>isGeneratedBy</h4>
<p>isGeneratedBy links Entity with ProcessExecution representing that Entity was generated as a result of ProcessExecution</p>
<p><i>Note: No arity constraints are assumed between Entity and ProcessExecution</i></p>
- <img src="diagram-history\DGarijoDiagrams\IsGeneratedBy.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/7/72/IsGeneratedBy.png" />
</section>
<section>
<h4>isDerivedFrom</h4>
<p>isDerivedFrom links two distinct characterized entities, where "some characterized entity is transformed from, created from, or affected by another characterized entity."
- <img src="diagram-history\DGarijoDiagrams\IsDerivedFrom.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/3/30/IsDerivedFrom.png" />
</section>
<section>
<h4>isUsedBy</h4>
<p>isUsedBy links Entity to ProcessExecution, where Entity is consumed by ProcessExecution.</p>
<p><i>Note: No arity constraints are assumed between Entity and ProcessExecution</i></p>
- <img src="diagram-history\DGarijoDiagrams\uses.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/b/b1/Uses.png" />
</section>
<section>
<h4>hasParticipant</h4>
@@ -199,12 +199,12 @@
<section>
<h4>isControlledBy</h4>
<p>isControlledBy links ProcessExecution to Agent, where "Control represents the involvement of an agent or a Entity in a process execution"<i>(from the Provenance Conceptual Model)</i></p>
- <img src="diagram-history\DGarijoDiagrams\IsControlledBy.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/6/64/IsControlledBy.png" />
</section>
<section>
<h4>isPrecededBy</h4>
<p>isPrecededBy links two instances of ProcessExecution, where "Ordering of processes execution (in provenance) needs to be modeled as a property linking process entities in specific order along a particular dimension (temporal or control flow)"</p>
- <img src="diagram-history\DGarijoDiagrams\IsPreceededBy.png" />
+ <img src="http://www.w3.org/2011/prov/wiki/images/a/a7/IsPreceededBy.png" />
</section>
</section>
<section>
--- a/paq/provenance-access.html Wed Aug 17 12:55:55 2011 +0100
+++ b/paq/provenance-access.html Wed Aug 17 13:47:31 2011 +0100
@@ -143,10 +143,21 @@
<dt>Service-URI</dt>
<dd>the URI of a Provenance Service.</dd>
<dt>Resource</dt>
+<<<<<<< local
<dd>a web resource, as <a href="http://www.w3.org/TR/webarch/#id-resources">described</a> by the Architecture of the World Wide Web [[WEBARCH]], section 2.2. A resource may be associated with multiple contexts (see <a href="#provenance-context"></a> for discussion)</dd>
+=======
+ <dd>a web resource. A resource may itself be a target but also can be associated with multiple targets.</dd>
+>>>>>>> other
</dl>
</p>
+<<<<<<< local
+=======
+ <p>
+ A key notion within these concepts is that a resource may not be the same as a target. Within provenance information, a resource may be described by one or more provenance model:Entities. Thus, a target refers to a provenance model:Entity and a Target-URI allows the target to be found within provenance information. Where a resource is a provenance model:Entity then it can be used as a target.
+ </p>
+
+>>>>>>> other
<p class="issue">
The terms context and context-URI are chosen to align with terminology used in describing the HTTP link header (a href="http://tools.ietf.org/html/rfc5988#section-5.2£>http://tools.ietf.org/html/rfc5988#section-5.2</a>) - does this terminology work in the current (ahem) context? See also next section.
</p>
@@ -229,7 +240,11 @@
When used in conjunction with an HTTP success response code (<code>2xx</code>), this HTTP header indicates that <code><cite>provenance-URI</cite></code> is the URI of some provenance for the requested resource and that the associated resource context is identified by <code><cite>context-URI</cite></code>.
</p>
<p>
+<<<<<<< local
If no <code>anchor</code> link is provided then the <code><cite>context-URI</cite></code> is assumed to be the URI of the resource.
+=======
+ If no target link is provided then the <code><cite>target-URI</cite></code> is assumed to be the URI of the resources. It is RECOMMENDED that this only be done when the resource is a provenance model Entity.
+>>>>>>> other
</p>
<p>
At this time, the meaning of these links returned with other HTTP response codes is not defined: future revisions of this specification may define interpretations for these.
@@ -280,6 +295,7 @@
The <code><cite>context-URI</cite></code> given by the <code>anchor</code> link element specifies an identifier for the presented document view, and which may be used within the provenance information when referring to this document.
</p>
<p>
+<<<<<<< local
An HTML document header MAY include multiple "provenance" link elements, indicating a number of different resources that are known to the creator of the document, each providing provenance about the document.
</p>
<p>
@@ -287,6 +303,9 @@
</p>
<p>
If no "anchor" link element is provided then the <code><cite>context-URI</cite></code> is assumed to be the URI of the document. It is RECOMMENDED that this only be done when the document is static.
+=======
+ If no target link element is provided then the <code><cite>target-URI</cite></code> is assumed to be the URI of the document. It is RECOMMENDED that this only be done when the document is a provenance model Entity.
+>>>>>>> other
</p>
<section>