* better link to semantics
authorJames Cheney <jcheney@inf.ed.ac.uk>
Wed, 21 Nov 2012 12:24:54 +0000
changeset 4894 c6c7b7bbda74
parent 4893 bfd2698bdc9b
child 4895 56f0774b069d
* better link to semantics
* correct links in constraints
model/prov-constraints.html
model/provbib.js
--- a/model/prov-constraints.html	Wed Nov 21 12:15:06 2012 +0000
+++ b/model/prov-constraints.html	Wed Nov 21 12:24:54 2012 +0000
@@ -1024,8 +1024,8 @@
  <h4>Constants, Variables and Placeholders</h4>
   <p>
   PROV statements involve identifiers, literals, 
-  placeholders, and attribute lists.  Identifiers are, according to PROV-N, expressed as <a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">qualified names</a> which can be mapped to URIs [[!RFC3987]].
-  However, in order to specify
+ placeholders, and attribute lists.  Identifiers are, according to PROV-N, expressed as <a href="http://www.w3.org/TR/2012/CR-prov-n-20121211/#prod-QUALIFIED_NAME">qualified names</a> which can be mapped to URIs [[!RFC3987]].
+ However, in order to specify
   constraints over PROV instances, we also need <em>variables</em>
   that represent unknown identifiers, literals, or placeholders.
   These variables are similar to those in first-order
@@ -1521,7 +1521,7 @@
 		<a class="rule-text" href="#impossible-object-property-overlap"><span>TBD</span></a><br>
 		<a class="rule-text" href="#entity-activity-disjoint"><span>TBD</span></a><br>
 	</td>
-	<td rowspan="8" style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component1" title="Component 1: Entities/Activities">1</a></td>
+	<td rowspan="8" style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component1" title="Component 1: Entities/Activities">1</a></td>
 </tr>
 <tr class="component1-color">
 	<td class="essential"><a>Activity</a></td>
@@ -1647,7 +1647,7 @@
 		<a class="rule-text" href="#derivation-generation-generation-ordering"><span>TBD</span></a><br>
 		<a class="rule-text" href="#typing"><span>TBD</span></a><br>
 	</td>
-	<td  rowspan="5"  style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component2" title="Component 2: Derivations">2</a></td>
+	<td  rowspan="5"  style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component2" title="Component 2: Derivations">2</a></td>
 </tr>
 <tr class="component2-color">
 	<td class="provType"><a>Revision</a></td>
@@ -1672,7 +1672,7 @@
 	<td><a class="rule-text" href="#key-object"><span>TBD</span></a><br>
 		<a class="rule-text" href="#impossible-object-property-overlap"><span>TBD</span></a><br>
 	</td>
-	<td  rowspan="5"  style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component3" title="Component 3: Agents/Responsibility">3</a></td>
+	<td  rowspan="5"  style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component3" title="Component 3: Agents/Responsibility">3</a></td>
 </tr>
 <tr class="component3-color">
 	<td class="essential"><a>Attribution</a></td>
@@ -1715,7 +1715,7 @@
 	<td><a title="bundle">Bundle constructor</a></td>
 	<td>No specific constraints; see <a href="#bundle-constraints"
 class="sectionRef"></a></td>
-	<td  rowspan="2"  style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component4" title="Component 4: Bundles">4</a></td>
+	<td  rowspan="2"  style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component4" title="Component 4: Bundles">4</a></td>
 </tr>
 <tr class="component4-color">
 	<td class="provType"><a title="bundle">Bundle type</a></td>
@@ -1732,7 +1732,7 @@
 		<a class="rule-text" href="#alternate-symmetric"><span>TBD</span></a><br>
 		<a class="rule-text" href="#typing"><span>TBD</span></a><br>
 	</td>
-	<td  rowspan="3"  style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component5" title="Component 5: Alternate Entities">5</a></td>
+	<td  rowspan="3"  style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component5" title="Component 5: Alternate Entities">5</a></td>
 </tr>
 <tr class="component5-color">
 	<td><a>Specialization</a></td>
@@ -1759,7 +1759,7 @@
 <tr class="component6-color">
 	<td><a>Collection</a></td>
 	<td> No specific constraints </td>
-	<td  rowspan="2"  style="text-align: center; "><a href="http://www.w3.org/TR/prov-dm/#component6" title="Component 6: Collections">6</a></td>
+	<td  rowspan="2"  style="text-align: center; "><a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#component6" title="Component 6: Collections">6</a></td>
 </tr>
 <tr class="component6-color">
 	<td><a>Membership</a></td>
@@ -2187,9 +2187,9 @@
   the instance.
   The only exceptions to this general rule, where  <span
   class="name">-</span> are to be left
-  in place, are the <a href="http://www.w3.org/TR/prov-dm/#derivation.activity">activity</a>, <a href="http://www.w3.org/TR/prov-dm/#derivation.generation">generation</a>, and <a href="http://www.w3.org/TR/prov-dm/#derivation.usage">usage</a> parameters in <span class="name">wasDerivedFrom</span> and
+  in place, are the <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#derivation.activity">activity</a>, <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#derivation.generation">generation</a>, and <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#derivation.usage">usage</a> parameters in <span class="name">wasDerivedFrom</span> and
   the <a
-  href="http://www.w3.org/TR/prov-dm/#association.plan">plan</a>
+  href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#association.plan">plan</a>
   parameter in <span class="name">wasAssociatedWith</span>.  This is
   further explained in remarks below.
   </p>
@@ -3107,13 +3107,13 @@
   </p>
   <div class='constraint' id='key-object'>
 <p><ol>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#entity.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#entity.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">entity(id,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#activity.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#activity.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the  <span class="name">activity(id,t1,t2,attrs)</span> statement.
    </li>
-<li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#agent.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+<li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#agent.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the  <span class="name">agent(id,attrs)</span> statement.
   </li>
   </ol>
@@ -3128,42 +3128,42 @@
   </p>
   <div class='constraint' id='key-properties'>
 <p><ol>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#generation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasGeneratedBy(id; e,a,t,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#usage.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">used(id; a,e,t,attrs)</span> statement.
   </li>
- <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+ <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#communication.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasInformedBy(id; a2,a1,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#start.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasStartedBy(id; a2,e,a1,t,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#end.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasEndedBy(id; a2,e,a1,t,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#invalidation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasInvalidatedBy(id; e,a,t,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#derivation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#derivation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasDerivedFrom(id;  e2, e1, a, g2, u1, attrs)</span> statement.
   </li>
- <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#attribution.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+ <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#attribution.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasAttributedTo(id; e,ag,attr)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#association.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasAssociatedWith(id; a,ag,pl,attrs)</span> statement.
  </li>
 <!--
- <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+ <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#association.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasAssociatedWith(id; a,ag,-,attrs)</span> statement.
   </li>
 -->
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#delegation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#delegation.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">actedOnBehalfOf(id; ag2,ag1,a,attrs)</span> statement.
   </li>
-  <li>The identifier field <a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
+  <li>The identifier field <a href="http://www.w3.org/TR/2012/CR-prov-dm-20121211/#influence.id"><span class="name">id</span></a> is a <span class="conditional">KEY</span> for
   the <span class="name">wasInfluencedBy(id; o2,o1,attrs)</span> statement.
   </li>
 </ol>
--- a/model/provbib.js	Wed Nov 21 12:15:06 2012 +0000
+++ b/model/provbib.js	Wed Nov 21 12:24:54 2012 +0000
@@ -17,7 +17,7 @@
                "http://www.w3.org/TR/2012/WD-prov-dc-20121211",
                "http://www.w3.org/TR/2012/WD-prov-xml-20121211",
                "http://www.w3.org/TR/2012/WD-prov-mention-20121211",
-	       "http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman",
+	       "http://www.w3.org/2011/prov/wiki/FormalSemanticsED",
 	       "http://lists.w3.org/Archives/Public/public-prov-comments/" ];
 
 var provReferences = {
@@ -30,9 +30,13 @@
 
         "PROV-SEM":
           "James Cheney; ed. "+
-          "<a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman\"><cite>Formal Semantics Strawman</cite></a>. "+
+          "<a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsED\"><cite>Formal Semantics of PROV</cite></a>. "+
           "2011, Work in progress. "+
+<<<<<<< local
+          "URL: <a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsED\">http://www.w3.org/2011/prov/wiki/FormalSemanticsED</a>.",
+=======
           "URL: <a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman\">http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman</a> ",
+>>>>>>> other
 
         "PROV-PRIMER":
           "Yolanda Gil; Simon Miles; eds. "+