--- a/model/prov-constraints.html	Fri Aug 10 17:21:36 2012 +0100
+++ b/model/prov-constraints.html	Fri Aug 10 17:27:45 2012 +0100
@@ -1774,7 +1774,7 @@
 <!--<span class="name">wasDerivedFrom</span>,-->
 <!--<span class="name">wasAttributedTo</span>,-->
 <span class="name">wasAssociatedWith</span>,
-<span class="name">actedOnBehalfOf</span>,
+<span class="name">actedOnBehalfOf</span>
    <!--<span class="name">wasInfluencedBy</span>
     -->
     }, if the <span class="name">i</span>th parameter
@@ -2258,12 +2258,14 @@
   <li>
     <span class="conditional">IF</span> <span class="name">wasInvalidatedBy(id; e,a,_t,attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id;  e, a, attrs)</span>.
   </li>
-<!--
-  <li>
-    <span class="conditional">IF</span> <span class="name">wasDerivedFrom(id;  e2, e1, attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id;  e2, e1, attrs)</span>.
+ <li>
+    <span class="conditional">IF</span> <span
+  class="name">wasDerivedFrom(id;  e2, e1, a, g, u, attrs)</span> <span
+  class="conditional">THEN</span> <span
+  class="name">wasInfluencedBy(id;  e2, e1, attrs)</span>.  Here,
+  <span class="name">a</span>, <span class="name">g</span>, <span class="name">u</span> MAY be placeholders <span class="name">-</span>.
   </li>
--->
- <li>
+<li>
     <span class="conditional">IF</span> <span class="name">wasAttributedTo(id; e,ag,attrs)</span> <span class="conditional">THEN</span> <span class="name">wasInfluencedBy(id; e, ag, attrs)</span>.
   </li>
   <li>
@@ -3819,11 +3821,7 @@
 
 <hr />
 
-  <div class="note">
-    @TODO: Add constraint to the effect that in a normal form,
-    wasDerivedFrom(e1,e2,-,g,u) is only legal if g and u are also "-".
-    </div>
- <p id="impossible-unspecified-derivation-generation-use_text">
+<p id="impossible-unspecified-derivation-generation-use_text">
 A derivation with unspecified activity <span class="name">wasDerivedFrom(id;e1,e2,-,g,u,attrs)</span> represents a derivation that
     takes one or more steps, whose activity, generation and use events
     are unspecified.  It is forbidden to specify a generation or use