--- a/model/prov-dm.html Wed Mar 28 15:01:35 2012 +0100
+++ b/model/prov-dm.html Wed Mar 28 15:16:00 2012 +0100
@@ -1019,10 +1019,10 @@
<tr class="component3-color"><td><a>Traceability</a></td><td><a title="tracedTo">tracedTo(id,e2,e1,attrs)</a></td></tr>
<tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td></tr>
<tr class="component4-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super)</a></td></tr>
-<tr class="component5-color"><td><a>Collection</a></td><td></td></tr>
-<tr class="component5-color"><td><a>Insertion</a></td><td>derivedByInsertionFrom(id, collAfter, collBefore, key, value, attrs)</td></tr>
-<tr class="component5-color"><td><a>Removal</a></td><td>derivedByRemovalFrom(id, collAfter, collBefore, key, attrs)</td></tr>
-<tr class="component5-color"><td><a>Membership</a></td><td>contained(id, coll, key, values, attrs)</td></tr>
+<tr class="component5-color"><td><a>Collection</a></td><td><a>Collection</a></td></tr>
+<tr class="component5-color"><td><a>Insertion</a></td><td><a title="derivedByInsertionFrom">derivedByInsertionFrom(id, c2, c1, kes, attrs)</a></td></tr>
+<tr class="component5-color"><td><a>Removal</a></td><td><a title="derivedByRemovalFrom">derivedByRemovalFrom(id, c2, c1, ks, attrs)</a></td></tr>
+<tr class="component5-color"><td><a>Membership</a></td><td><a title="memberOf">memberOf(id, c, kes, attrs)</a></td></tr>
<tr class="component6-color"><td><a>Note</a></td><td><a title="note">note(id, [ attr1=val1, ...])</a></td></tr>
<tr class="component6-color"><td><a>Annotation</a></td><td><a title="hasAnnotation">hasAnnotation(r,n)</a></td></tr>
</table>
@@ -2125,14 +2125,16 @@
The insertion and removal relations make insertions and removals explicit as part of the history of a collection. This, however, requires explicit mention of the state of the collection prior to each insertion. The membership relation removes this needs, allowing the state of a collection <span class="name">c</span> to be asserted without having to introduce a prior state. This allows for the natural expression of a collection state, for instance in cases where a program or workflow block produces a new collection <span class="name">c</span> with known content. In such cases,
<span class="name">memberOf(id, c,{(key_1, e_1), ..., (key_n, e_n)})</span> asserts that <span class="name">c</span> is known to include <span class="name">{(key_1, e_1), ..., (key_n, e_n)}</span>, without having to introduce an initial state. <br/>
-<p> A <strong>Membership</strong> relation, written <span class="pnExpression"> memberOf(id, coll, key-value-set, attrs)</span>, contains:</p>
+<p>
+<div class="attributes" id="attributes-memberOf">
+ A <dfn title="memberOf">membership</dfn> relation, written <span class="pnExpression"> memberOf(id, coll, key-value-set, attrs)</span>, contains:
<ul>
<li><span class='attribute'>id</span>: an OPTIONAL identifier identifying the relation;</li>
<li><span class='attribute'>after</span>: an identifier for the collection whose members are asserted; </li>
<li><span class='attribute'>key-value-set</span>: a set of key-value pairs that are members of the collection, of the form {(key_1, e_1), ..., (key_n, e_n)}</li>
<li><span class='attribute'>attributes</span>: an OPTIONAL set of attribute-value pairs to further describe the properties of the relation.</li>
-
</ul>
+</div>
<div class="anexample">