merged stephan prov:Membership adds
authorTim L <lebot@rpi.edu>
Mon, 02 Apr 2012 13:08:37 -0400
changeset 2217 958ceda539d1
parent 2214 68a398405105 (current diff)
parent 2213 c35f41c4b638 (diff)
child 2218 3084783ff413
merged stephan prov:Membership adds
--- a/model/prov-dm-constraints.html	Mon Apr 02 10:31:14 2012 -0600
+++ b/model/prov-dm-constraints.html	Mon Apr 02 13:08:37 2012 -0400
@@ -252,7 +252,7 @@
 <li>Structural constraints are further constraints to be satisfied by generation descriptions  (<a href="#structural-constraints">Section 7</a>)</li>
 <li>Collection constraints are the constraints that hold for collections (<a href="#collection-constraints">Section 8</a>)</li>
 </ul>
-</div>
+
   
 
 
@@ -1130,7 +1130,7 @@
 </section>
 
 
-</section> 
+
 
 <section id="account-constraints"> 
 <h3>PROV-DM Account Constraints</h3>
@@ -1678,7 +1678,7 @@
 The following constraint ensures unique derivation.
 
 
-<div class='constraint' id='collection-unique-derivation'/>
+<div class='constraint' id='collection-unique-derivation'>
 
   <p>The state of a collection that is derived through multiple insertions, removal, or membership relations is undefined.
 
@@ -1693,18 +1693,18 @@
 derivedByInsertionFrom(c, c1, {(k1, v1), (k2, v2)})
 derivedByInsertionFrom(c, c2, {(k3, v3)})
 </pre>
-is undefined (unless the two sets were identical, in which case one of the two statements would be redundant)<p/>
+<p>is undefined (unless the two sets were identical, in which case one of the two statements would be redundant)</p>
 </div>
 
-As a particular case, the state of <span class="name">c</span> as derived multiple times from the same <span class="name">c1</span> is undefined. <p/>
+<p>As a particular case, the state of <span class="name">c</span> as derived multiple times from the same <span class="name">c1</span> is undefined. </p>
 <div class="anexample">
   <pre class="codeexample">
 derivedByInsertionFrom(id1, c, c1, {(k1, v1), (k2, v2)})
 derivedByInsertionFrom(id2, c, c1, {(k3, v3), (k4, v4)})
 </pre>
-  is undefined. <p/>
-   The expected way to accomplish the effect intended with these statements, is as follows:
-  <pre class="codeexample">
+<p>is undefined. </p>
+<p> The expected way to accomplish the effect intended with these statements, is as follows:</p>
+<pre class="codeexample">
 derivedByInsertionFrom(id1, c, c1, {(k1, v1), (k2, v2), (k3, v3), (k4, v4)})
 </pre>  
 </div>
@@ -1723,8 +1723,6 @@
   is undefined.
 </div>
 
-</div>
-
 
 
 <!--
--- a/model/prov-dm.html	Mon Apr 02 10:31:14 2012 -0600
+++ b/model/prov-dm.html	Mon Apr 02 13:08:37 2012 -0400
@@ -1999,7 +1999,7 @@
 
 
 <p><div class="attributes" id="attributes-derivedByInsertionFrom">
-A <dfn title="derivedByInsertionFrom">Derivation-by-Insertion</dfn> relation<span class="withPn">, written <span class="pnExpression">derivedByInsertionFrom(id, c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</span>,</span> contains:</p>
+<p>A <dfn title="derivedByInsertionFrom">Derivation-by-Insertion</dfn> relation<span class="withPn">, written <span class="pnExpression">derivedByInsertionFrom(id, c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</span>,</span> contains:</p>
 <ul>
 <li><span class='attribute' id="derivedByInsertionFrom.id">id</span>:  an OPTIONAL identifier identifying the relation;</li>
 <li><span class='attribute' id="derivedByInsertionFrom.after">after</span>: an identifier (<span class="name">c2</span>) for the collection <em>after</em> insertion; </li>
@@ -2076,7 +2076,7 @@
 
 <p>
 <div class="attributes" id="attributes-derivedByRemovalFrom">
- A <dfn title="derivedByRemovalFrom">Derivation-by-Removal</dfn> relation, written <span class="pnExpression">derivedByRemovalFrom(id, c2, c1, {key_1, ... key_n}, attrs)</span>, contains:</p>
+<p> A <dfn title="derivedByRemovalFrom">Derivation-by-Removal</dfn> relation, written <span class="pnExpression">derivedByRemovalFrom(id, c2, c1, {key_1, ... key_n}, attrs)</span>, contains:</p>
 <ul>
 <li><span class='attribute' id="derivedByRemovalFrom.id">id</span>:  an OPTIONAL identifier identifying the relation;</li>
 <li><span class='attribute' id="derivedByRemovalFrom.after">after</span>: an identifier (<span class="name">c2</span>) for the collection  <em>after</em> the deletion; </li>