--- a/model/ProvenanceModel.html Wed Sep 07 17:30:11 2011 +0100
+++ b/model/ProvenanceModel.html Wed Sep 07 17:45:09 2011 +0100
@@ -537,7 +537,7 @@
<span class="nonterminal">expression</span> :=
<span class="nonterminal">node</span> <!-- better name than node?? -->
| <span class="nonterminal">relation</span>
-| <span class="nonterminal">assertionBundle</span>
+| <span class="nonterminal">bundle</span>
<br/>
<!-- -->
<span class="nonterminal">node</span> :=
@@ -555,15 +555,18 @@
|<span class="nonterminal">revision</span>
|<span class="nonterminal">participation</span> <br/>
<!-- -->
-<span class="nonterminal">assertionBundles</span> :=
+<span class="nonterminal">bundle</span> :=
<span class="nonterminal">container</span>
|<span class="nonterminal">account</span>
</div>
</section>
+
+ <section id="expression-node">
+<h3>Node</h3>
<section id="expression-Entity">
-<h3>Entity</h3>
+<h4>Entity</h4>
<p>In PIDM, an <dfn id="dfn-entity" title="entity">entity expression</dfn> is a representation of an identifiable characterized thing.</p>
@@ -761,12 +764,13 @@
<span class="name">agent(e)</span> also holds.
</div>
</section>
-
+</section>
+
+<section id="expression-relation">
+<h3>Relation</h3>
<section id="expression-Generation">
-<h3>Generation<br>
-</h3>
-
+<h4>Generation</h4>
<p>In PIDM, a <dfn id="dfn-Generation">generation expression</dfn> is a representation of a world event, the creation of a new characterized thing by an activity. This characterized thing did not exist before creation. </p>
@@ -1514,10 +1518,13 @@
<div class='pending'>Suggested definition for participation. This is <a href="http://www.w3.org/2011/prov/track/issues/49">ISSUE-49</a>.</div>
</section>
-
+</section>
+
+<section id="expression-bundle">
+<h3>Bundle</h3>
<section id="expression-ProvenanceContainer">
-<h3>Provenance Container</h3>
+<h4>Provenance Container</h4>
<p>A <dfn id="dfn-ProvenanceContainer">Provenance Container</dfn> is an identifiable wrapper for a set of PIDM constructs, which allows for additional meta-information pertaining to these constructs to be expressed. A provenance container MAY contain other provenance containers.</p>
@@ -1557,7 +1564,7 @@
<span class="nonterminal">account</span> :=
<span class="name">account</span>
<span class="name">(</span>
-<span class="nonterminal">assertionBundle</span>
+<span class="nonterminal">bundle</span>
<span class="name">)</span>
</div>
@@ -1581,6 +1588,7 @@
in the resulting union. </p>
</section>
+</section>
<section id="expression-Collection">
<h3>Collection</h3>
@@ -1604,6 +1612,11 @@
</section>
+<section id="expression-literal">
+<h3>Literal?</h3>
+
+
+
<section id="expression-Time">
<h3>Time</h3>
@@ -1714,6 +1727,8 @@
</section>
+</section>
+
</section>
@@ -1836,7 +1851,7 @@
<span class="nonterminal">expression</span> :=
<span class="nonterminal">node</span> <!-- better name than node?? -->
| <span class="nonterminal">relation</span>
-| <span class="nonterminal">assertionBundle</span>
+| <span class="nonterminal">bundle</span>
<br/>
<!-- -->
<span class="nonterminal">node</span> :=
@@ -1854,7 +1869,7 @@
|<span class="nonterminal">revision</span>
|<span class="nonterminal">participation</span> <br/>
<!-- -->
-<span class="nonterminal">assertionBundles</span> :=
+<span class="nonterminal">bundle</span> :=
|<span class="nonterminal">container</span>
|<span class="nonterminal">account</span> <br/>
<!-- -->