--- a/model/prov-constraints.html	Sat Apr 28 13:14:26 2012 +0100
+++ b/model/prov-constraints.html	Sun Apr 29 14:12:52 2012 +0100
@@ -52,14 +52,14 @@
 
 
         "PROV-DM":
-          "Luc Moreau and Paolo Missier (eds.) ... "+
-          "<a href=\"http://www.w3.org/TR/prov-dm/\"><cite>PART 1: PROV-DM ...</cite></a>. "+
-          "2011, Working Draft. "+
+          "Luc Moreau and Paolo Missier (eds.) Khalid Belhajjame, Reza B'Far, Stephen Cresswell, Yolanda Gil, Paul Groth, Graham Klyne, Jim McCusker, Simon Miles, James Myers, Satya Sahoo, and Curt Tilmes"+
+          "<a href=\"http://www.w3.org/TR/prov-dm/\"><cite>PROV-DM: The PROV Data Model</cite></a>. "+
+          "2012, Working Draft. "+
           "URL: <a href=\"http://www.w3.org/TR/prov-dm/\">http://www.w3.org/TR/prov-dm/</a>",
 
         "PROV-N":
-          "Luc Moreau and Paolo Missier (eds.) ... "+
-          "<a href=\"http://www.w3.org/TR/prov-n/\"><cite>PROV-N ....</cite></a>. "+
+          "Luc Moreau and Paolo Missier (eds.)"+
+          "<a href=\"http://www.w3.org/TR/prov-n/\"><cite>PROV-N: The Provenance Notation</cite></a>. "+
           "2011, Working Draft. "+
           "URL: <a href=\"http://www.w3.org/TR/prov-n/\">http://www.w3.org/TR/prov-n/</a>",
 
@@ -78,22 +78,22 @@
       };
       var respecConfig = {
           // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
-          specStatus:           "ED",
+          specStatus:           "FPWD",
           
           // the specification's short name, as in http://www.w3.org/TR/short-name/
           shortName:            "prov-constraints",
  
           // if your specification has a subtitle that goes below the main
           // formal title, define it here
-          subtitle   :  "WD5, being updated following internal review",
+//          subtitle   :  "WD5, being updated following internal review",
 
 
           // if you wish the publication date to be other than today, set this
-          //publishDate:  "2012-02-01",
+          publishDate:  "2012-05-03",
  
           // if the specification's copyright date is a range of years, specify
           // the start date here:
-          copyrightStart: "2011",
+          copyrightStart: "2012",
  
           // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
           // and its maturity status
@@ -281,8 +281,28 @@
  href="#collection-constraints" class="sectionRef"></a> and <a
  href="#account-constraints" class="sectionRef"></a>).  </p>
 
-
-
+<<<<<<< local
+<!--
+<div class="note">Question to James: The term 'PROV Instance' seems to have a precise meaning. I read this as a PROV Description Set. Should we define it? Every where it occurs, there is a link to its first occurrence.</div>
+-->
+=======
+>>>>>>> other
+
+<<<<<<< local
+<p>
+The specification also describes how the inferences, definitions, and
+constraints should be used (<a href="#compliance"
+class="sectionRef"></a>).  Briefly, a PROV compliant application is
+allowed (but not required) to treat two PROV descriptions the same
+if they are equal after applying the inference rules and possibly
+reordering expressions, and we can define a canonical form for <a title="PROV instance">PROV
+instances</a> obtained by applying all possible inference rules.  In
+addition, a validating PROV application is required to check that
+the constraints are satisfied in (the normal form of) provenance data generated or consumed by the application.
+</p>
+=======
+
+>>>>>>> other
 
 <p>
 Finally, the specification includes a section (<a
@@ -1125,7 +1145,7 @@
 <div style="text-align: center;">
 <figure>
 <figcaption id="ordering-activity-fig">Summary of <a title="instantaneous event">instantaneous event</a> ordering constraints for activities</figcaption>
-<img src="../images/ordering-activity.png" alt="constraints between events" />
+<img src="images/ordering-activity.png" alt="constraints between events" />
 </figure>
 </div>
 
@@ -1289,7 +1309,7 @@
 <div style="text-align: center;">
 <figure>
 <figcaption id="ordering-entity-fig">Summary of <a title="instantaneous event">instantaneous event</a> ordering constraints for entities</figcaption>
-<img src="../images/ordering-entity.png" alt="ordering constraints for entities" />
+<img src="images/ordering-entity.png" alt="ordering constraints for entities" />
 </figure>
 </div>
 
@@ -1458,7 +1478,7 @@
 <div style="text-align: center;">
 <figure>
 <figcaption id="ordering-entity-trigger-fig">Summary of <a title="instantaneous event">instantaneous event</a> ordering constraints for trigger entities</figcaption>
-<img src="../images/ordering-entity-trigger.png" alt="ordering constraints for trigger entities" />
+<img src="images/ordering-entity-trigger.png" alt="ordering constraints for trigger entities" />
 </figure>
 </div>
 
@@ -1479,7 +1499,7 @@
 <div style="text-align: center;">
 <figure>
 <figcaption id="ordering-agents">Summary of <a title="instantaneous event">instantaneous event</a> ordering constraints (continued)</figcaption>
-<img src="../images/ordering-agents.png" alt="ordering constraints for agents" />
+<img src="images/ordering-agents.png" alt="ordering constraints for agents" />
 </figure>
 </div>