--- a/model/prov-constraints.html	Fri Jul 20 09:18:06 2012 +0100
+++ b/model/prov-constraints.html	Fri Jul 20 12:53:12 2012 +0200
@@ -645,8 +645,7 @@
 constraints of this document.
 </p>
 
-<div class="note">Table: work in progress; do when rest is
-  stable. Also, standardize constraint names.</div>
+<div class="note">Table: work in progress; these entries might change when the document is updated.</div>
 
 <div id="prov-constraints-fig" style="text-align: left;">
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
@@ -654,49 +653,208 @@
 <tr><td><a><b>Type or Relation Name</b></a></td><td><b>Definitions, Constraints, Inferences</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>
 
-<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a class="rule-text" href="#unique-entity"><span>TBD</span></a><br><a class="rule-text" href="#unique-generation-time"><span>TBD</span></a><br><a class="rule-text" href="#unique-invalidation-time"><span>TBD</span></a></td><td rowspan="8"><a href="http://www.w3.org/TR/prov-dm/#component1">Component 1: Entities/Activities</a></td></tr>
-<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a class="rule-text" href="#unique-activity"><span>TBD</span></a><br><a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br><a class="rule-text" href="#unique-endTime"><span>TBD</span></a><br><a class="rule-text" href="#usage-within-activity"><span>TBD</span></a><br><a class="rule-text" href="#generation-within-activity"><span>TBD</span></a></td></tr>
-<tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a class="rule-text" href="#unique-generation"><span>TBD</span></a><br><a class="rule-text" href="#unique-generation-time"><span>TBD</span></a><br><a class="rule-text" href="#generation-within-activity"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a class="rule-text" href="#usage-within-activity"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td class="essential"><a>Communication</a></td><td><a class="rule-text" href="#wasInformedBy-definition"><span>TBD</span></a> </td></tr>
-<tr class="component1-color"><td><a>Start</a></td><td><a class="rule-text" href="#wasStartedBy-inference"><span>TBD</span><br></a><a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br> <a class="rule-text" href="#start-precedes-end"><span>TBD</span></a></td></tr>
-<tr class="component1-color"><td><a>End</a></td><td><a class="rule-text" href="#wasEndedBy-inference"><span>TBD</span></a><br><a class="rule-text" href="#unique-endTime"><span>TBD</span></a> <br> <a class="rule-text" href="#start-precedes-end"><span>TBD</span></a></td></tr>
-<tr class="component1-color"><td><a>Invalidation</a></td><td><a class="rule-text" href="#unique-invalidation-time"><span>TBD</span></a></td> </tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-
-<tr class="component2-color"><td class="essential"><a>Derivation</a></td><td><a class="rule-text" href="#derivation-use"><span>TBD</span></a></td><td  rowspan="5"><a href="http://www.w3.org/TR/prov-dm/#component2">Component 2: Derivations</a></td></tr>
-<tr class="component2-color"><td class="provType"><a>Revision</a></td><td></td></tr>
-<tr class="component2-color"><td class="provType"><a>Quotation</a></td><td></td></tr>
-<tr class="component2-color"><td class="provType"><a>Original Source</a></td><td></td></tr>
-<tr class="component2-color"><td><a>Influence</a></td><td><a class="rule-text" href="#influence-inference"><span>TBD</span></a></td></tr>
+<tr class="component1-color">
+	<td class="essential"><a>Entity</a></td>
+	<td><a class="rule-text" href="#entity-generation-invalidation-inference"><span>TBD</span></a><br>
+		<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>
+		<a class="rule-text" href="#entity-activity-disjoint"><span>TBD</span></a><br>
+	</td>
+	<td rowspan="8"><a href="http://www.w3.org/TR/prov-dm/#component1">Component 1: Entities/Activities</a></td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Activity</a></td>
+	<td><a class="rule-text" href="#activity-start-end-inference"><span>TBD</span></a><br>
+		<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>
+		<a class="rule-text" href="#entity-activity-disjoint"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Generation</a></td>
+	<td><a class="rule-text" href="#generation-use-communication-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#generation-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-generation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#generation-within-activity"><span>TBD</span></a><br>
+		<a class="rule-text" href="#generation-precedes-invalidation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#generation-precedes-usage"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Usage</a></td>
+	<td><a class="rule-text" href="#usage-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#usage-within-activity"><span>TBD</span></a><br>
+		<a class="rule-text" href="#usage-precedes-invalidation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Communication</a></td>
+	<td><a class="rule-text" href="#communication-generation-use-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#communication-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#wasInformedBy-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Start</a></td>
+	<td><a class="rule-text" href="#wasStartedBy-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#start-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-wasStartedBy"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-startTime"><span>TBD</span></a><br>
+		<a class="rule-text" href="#start-precedes-end"><span>TBD</span></a><br>
+		<a class="rule-text" href="#wasStartedBy-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>End</a></td>
+	<td><a class="rule-text" href="#wasEndedBy-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#end-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-wasEndedBy"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-endTime"><span>TBD</span></a><br>
+		<a class="rule-text" href="#wasEndedBy-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component1-color">
+	<td class="essential"><a>Invalidation</a></td>
+	<td><a class="rule-text" href="#invalidation-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#unique-invalidation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component3-color" style="border-collapse: collapse; "><td  class="essential"><a>Agent</a></td><td> </td><td  rowspan="8"><a href="http://www.w3.org/TR/prov-dm/#component3">Component 3: Agents/Responsibility</a></td></tr>
-<tr class="component3-color"><td class="essential"><a>Attribution</a></td><td><a class="rule-text" href="#attribution-inference"><span>TBD</span></a> </td></tr>
-<tr class="component3-color"><td class="essential"><a>Association</a></td><td> </td></tr>
-<tr class="component3-color"><td class="essential"><a>Delegation</a></td><td> </td></tr>
-<tr class="component3-color"><td class="provType"><a>Plan</a></td><td> </td></tr>
-<tr class="component3-color"><td class="provType"><a>Person</a></td> <td></td></tr>
-<tr class="component3-color"><td class="provType"><a>Organization</a></td><td></td></tr>
-<tr class="component3-color"><td class="provType"><a title="software-agent">SoftwareAgent</a></td><td></td>
+
+<tr class="component2-color">
+	<td class="essential"><a>Derivation</a></td>
+	<td><a class="rule-text" href="#derivation-generation-use"><span>TBD</span></a><br>
+		<a class="rule-text" href="#derivation-use"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specific-derivation-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#derivation-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#derivation-usage-generation-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#derivation-generation-generation-ordering"><span>TBD</span></a><br>
+	</td>
+	<td  rowspan="4"><a href="http://www.w3.org/TR/prov-dm/#component2">Component 2: Derivations</a></td>
+</tr>
+<tr class="component2-color">
+	<td class="provType"><a>Revision</a></td>
+	<td><a class="rule-text" href="#revision-is-alternate"><span>TBD</span></a><br></td>
+</tr>
+<tr class="component2-color">
+	<td class="provType"><a>Quotation</a></td>
+	<td></td>
+</tr>
+<tr class="component2-color">
+	<td class="provType"><a>Primary Source</a></td>
+	<td></td>
+</tr>
+<tr class="component2-color">
+	<td><a class="essential">Influence</a></td>
+	<td></td>
+</tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-
-
-<tr class="component4-color"><td><a title="bundle">Bundle constructor</a></td><td></td><td  rowspan="3"><a href="http://www.w3.org/TR/prov-dm/#component4">Component 5: Bundles</a></td></tr>
-<tr class="component4-color"><td class="provType"><a title="bundle">Bundle type</a></td><td> </td></tr>
-<tr class="component4-color"><td><a>Provenance Locator</a></td><td></td></tr>
+<tr class="component3-color" style="border-collapse: collapse; ">
+	<td  class="essential"><a>Agent</a></td>
+	<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"><a href="http://www.w3.org/TR/prov-dm/#component3">Component 3: Agents/Responsibility</a></td>
+</tr>
+<tr class="component3-color">
+	<td class="essential"><a>Attribution</a></td>
+	<td><a class="rule-text" href="#attribution-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#attribution-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#wasAttributedTo-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component3-color">
+	<td class="essential"><a>Association</a></td>
+	<td><a class="rule-text" href="#association-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#wasAssociatedWith-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component3-color">
+	<td class="essential"><a>Delegation</a></td>
+	<td><a class="rule-text" href="#delegation-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#delegation-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#actedOnBehalfOf-ordering"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-property-overlap"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component3-color">
+	<td class="essential"><a>Influence</a></td>
+	<td><a class="rule-text" href="#influence-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#key-properties"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-influence-reflexive"><span>TBD</span></a><br>
+	</td>
+</tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component5-color"><td><a>Alternate</a></td><td><a class="rule-text" href="#alternate-reflexive"><span>TBD</span></a><br><a class="rule-text" href="#alternate-transitive"><span>TBD</span></a><br><a class="rule-text" href="#alternate-symmetric"><span>TBD</span></a> </td><td  rowspan="2"><a href="http://www.w3.org/TR/prov-dm/#component5">Component 5: Alternate</a></td></tr>
-<tr class="component5-color"><td><a>Specialization</a></td><td><a class="rule-text" href="#specialization-irreflexive"><span>TBD</span></a><br><a class="rule-text" href="#specialization-transitive"><span>TBD</span></a><br><a class="rule-text" href="#specialization-antisymmetric"><span>TBD</span></a><br><a class="rule-text" href="#specialization-alternate"><span>TBD</span></a> </td></tr>
-<tr class="component5-color"><td><a>Mention</a></td><td></td></tr>
+<tr class="component4-color">
+	<td><a title="bundle">Bundle constructor</a></td>
+	<td></td>
+	<td  rowspan="2"><a href="http://www.w3.org/TR/prov-dm/#component4">Component 4: Bundles</a></td>
+</tr>
+<tr class="component4-color">
+	<td class="provType"><a title="bundle">Bundle type</a></td>
+	<td> </td>
+</tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
-<tr class="component6-color"><td><a>Collection</a></td><td> </td><td  rowspan="3"><a href="http://www.w3.org/TR/prov-dm/#component6">Component 6: Collections</a></td></tr>
-<tr class="component6-color"><td><a title="empty dictionary">EmptyDictionary</a></td><td></td></tr>
-<tr class="component6-color"><td><a>Membership</a></td><td> </td></tr>
+<tr class="component5-color">
+	<td><a>Alternate</a></td>
+	<td><a class="rule-text" href="#alternate-reflexive"><span>TBD</span></a><br>
+		<a class="rule-text" href="#alternate-transitive"><span>TBD</span></a><br>
+		<a class="rule-text" href="#alternate-symmetric"><span>TBD</span></a><br>
+		<a class="rule-text" href="#alternate-type-inference"><span>TBD</span></a><br>
+	</td>
+	<td  rowspan="3"><a href="http://www.w3.org/TR/prov-dm/#component5">Component 5: Alternate Entities</a></td>
+</tr>
+<tr class="component5-color">
+	<td><a>Specialization</a></td>
+	<td><a class="rule-text" href="#specialization-transitive"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specialization-alternate"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specialization-attributes"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specialization-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specialization-generation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#specialization-invalidation"><span>TBD</span></a><br>
+		<a class="rule-text" href="#impossible-specialization-reflexive"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr class="component5-color">
+	<td><a>Mention</a></td>
+	<td><a class="rule-text" href="#mention-specialization"><span>TBD</span></a><br>
+		<a class="rule-text" href="#mention-type-inference"><span>TBD</span></a><br>
+		<a class="rule-text" href="#mention-unique"><span>TBD</span></a><br>
+	</td>
+</tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component6-color">
+	<td><a>Collection</a></td>
+	<td> </td>
+	<td  rowspan="2"><a href="http://www.w3.org/TR/prov-dm/#component6">Component 6: Collections</a></td>
+</tr>
+<tr class="component6-color">
+	`<td><a>Membership</a></td>
+	<td><a class="rule-text" href="#membership-type-inference"><span>TBD</span></a><br></td>
+</tr>
 </table>
 </div>