--- a/model/prov-dm.html	Tue Jun 12 16:27:05 2012 +0100
+++ b/model/prov-dm.html	Tue Jun 12 16:36:48 2012 +0100
@@ -3026,7 +3026,7 @@
  A <dfn title="memberOf-d">membership</dfn> relation, written <span class="pnExpression">memberOf(id; c, {(key_1, e_1), ..., (key_n, e_n)}, cplt, attrs)</span>, has:
 <ul>
 <li><span class='attribute' id="membership-d.id">id</span>:  an OPTIONAL identifier identifying the relation;</li>
-<li><span class='attribute' id="membership-d.collection">collection</span>: an identifier (<span class="name">c</span>) for the dictionary whose members are asserted; </li>
+<li><span class='attribute' id="membership-d.dictionary">dictionary</span>: an identifier (<span class="name">c</span>) for the dictionary whose members are asserted; </li>
 <li><span class='attribute' id="membership-d.key-entity-set">key-entity-set</span>: a set of key-entity pairs <span class="name">(key_1, e_1)</span>, ..., <span class="name">(key_n, e_n)</span> that are members of the dictionary;</li>
 <li><span class='attribute' id="membership-d.complete">complete</span>: an OPTIONAL boolean 
 <a title="value">Value</a> (<span class="name">cplt</span>). It is interpreted as follows:

--- a/model/prov-n.html	Tue Jun 12 16:27:05 2012 +0100
+++ b/model/prov-n.html	Tue Jun 12 16:36:48 2012 +0100
@@ -2170,20 +2170,21 @@
 <table class="grammar">
 <tbody class="grammar-ref" data-ref="prod-membershipExpression"></tbody>
 <tbody class="grammar-ref" data-ref="prod-complete"></tbody>
+<tbody class="grammar-ref" data-ref="prod-entitySet"></tbody>
 </table>
 
 
 <p>The following table summarizes how each constituent of a PROV-DM Membership maps to a non-terminal.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Membership</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b>Collection Membership</b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.id"><span class='attribute' id="membership.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.collection"><span class='attribute' id="membership.collection">collection</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
 
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.key-entity-set"><span class='attribute' id="membership.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.entity-set"><span class='attribute' id="membership.entity-set">entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-entitySet">entitySet</a></code></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.complete"><span class='attribute' id="membership.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
 
@@ -2191,6 +2192,23 @@
 </table>
 </div>
 
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Dictionary Membership</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.id"><span class='attribute' id="membership-d.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.dictionary"><span class='attribute' id="membership-d.dictionary">dictionary</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.key-entity-set"><span class='attribute' id="membership-d.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.complete"><span class='attribute' id="membership-d.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.attributes"><span class='attribute' id="membership-d.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
+
 
 
 <div class="anexample">
@@ -2390,6 +2408,7 @@
 <tbody class="grammar-ref" data-ref="prod-gIdentifier"></tbody>
 <tbody class="grammar-ref" data-ref="prod-uIdentifier"></tbody>
 <tbody class="grammar-ref" data-ref="prod-cIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-dIdentifier"></tbody>
 <tbody class="grammar-ref" data-ref="prod-bIdentifier"></tbody>
 
 <tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"></tbody>