--- a/model/prov-n.html Tue May 15 12:54:15 2012 +0100
+++ b/model/prov-n.html Tue May 15 13:10:09 2012 +0100
@@ -319,7 +319,8 @@
<p>This document introduces the PROV-N grammar along with examples of its usage.</p>
<p>Its target audience is twofold:
<ul>
-<li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal <a href="#ExpressionContainer">container</a>.</li>
+<li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal
+<a class="grammarRef" href="#prod-bundle">bundle</a>.</li>
<li>Readers of the [[PROV-DM]] and of [[PROV-CONSTRAINTS]] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the <a href="#grammar-notation">expression</a> nonterminal a useful entry point into the grammar.</li>
</ul>
@@ -338,11 +339,10 @@
<p><a href="#prov-n-expressions">Section 4</a> presents the grammar of all expressions of the language grouped according to the PROV data model components.</p>
-<p><a href="#ExpressionContainer">Section 5</a> defines the grammar of containers, a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
-
-<p><a href="#account">Section 6</a> defines the grammar of accounts.</p>
-
-<p><a href="#media-type">Section 7</a> defines media type for the PROV-N notation.</p>
+<p><a href="#toplevelBundle">Section 5</a> defines the grammar of toplevel bundles, a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
+
+
+<p><a href="#media-type">Section 6</a> defines media type for the PROV-N notation.</p>
</section>
@@ -452,7 +452,8 @@
</ul>
</div>
-The grammar is centered on nonterminals for various types of <span class="nonterminal">expression</span>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level <a href="#ExpressionContainer">container</a> nonterminal as a starting point instead.
+The grammar is centered on nonterminals for various types of <span class="nonterminal">expression</span>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level
+<a class="grammarRef" href="#prod-bundle">bundle</a> nonterminal as a starting point instead.
<!--
@@ -515,7 +516,7 @@
Each expression non-terminal <span class="nonterminal">expression</span>, i.e., <span class="nonterminal">entityExpression</span>, <span class="nonterminal">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
-<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <a>expression container</a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
+<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <a>toplevel bundle</a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
</section>
@@ -2253,32 +2254,30 @@
-<section id="ExpressionContainer">
-<h4>Expression Container</h4>
-
-<p>An <dfn>expression container</dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations. An expression container forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them. An expression container may be used
+<section id="toplevelBundle">
+<h4>Toplevel Bundle</h4>
+
+<p>A <dfn>toplevel bundle</dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations. A toplevel bundle forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them. A toplevel bundle may be used
to package up PROV-N <a title="record">expressions</a> in response to a request for the provenance of something ([[PROV-AQ]]).</p>
-<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions, an expression container is not defined as a PROV-N expression (<a href="#grammar-notation">production <span class="nonterminal">expression</span></a>).</p>
-
-
-<p>An expression container, written <span class="name">container decls exprs endContainer</span> in PROV-N, contains:
+<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions, a toplevel bundle is not defined as a PROV-N expression (production <a class="grammarRef" href="#prod-expression">expression</a>).</p>
+
+
+<p>A toplevel bundle, written <span class="name">bundle decls exprs bundles endBundle</span> in PROV-N, contains:
<ul>
<li><em>namespaceDeclarations</em>: a set <span class="name">decls</span> of namespace declarations, declaring namespaces and associated prefixes, which can be used in <a
title="attribute">attributes</a> and <a title="identifier">identifiers</a> occurring inside <span class="name">exprs</span>;</li>
-<li><em>expressions</em>: a non-empty set of expressions <span class="name">exprs</span>.</li>
+<li><em>expressions</em>: a non-empty set of expressions <span class="name">exprs</span>;</li>
+<li><em>namedBundles</em>: a set of <a href="#expression-bundle-declaration">bundle declarations</a> <span class="name">bundles</span>;</li>
</ul>
-<p>An expression container's text matches the <span class="nonterminal">expressionContainer</span> production.</p>
-
-
-<div class='grammar'>
-<span class="nonterminal">expressionContainer</span> ::=
-<span class="name">container</span>
-<span class="nonterminal">namespaceDeclarations</span>
-<span class="plus"> <span class="nonterminal">expression</span> </span>
-<span class="name">endContainer</span>
-</div>
+<p>A toplevel bundle's text matches the <a class="grammarRef"
+ href="#prod-bundle">bundle</a> production.</p>
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-bundle"></tbody>
+</table>
+
<div class="anexample">
@@ -2287,7 +2286,8 @@
<span class="name">e2</span>.
</p>
<pre class="codeexample">
-container
+bundle
+ default <http://anotherexample.org/>
prefix ex <http://example.org/>
entity(e2, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice",
@@ -2297,7 +2297,7 @@
wasAssociatedWith(a1, ag2, -, [prov:role="author"])
agent(ag2, [ prov:type="prov:Person" %% xsd:QName, ex:name="Bob" ])
-endContainer
+endBundle
</pre>
<p>This container could for instance be returned as the result of a query to a provenance store for the provenance of entity <span class="name">e2</span> [[PROV-AQ]].
</p>
@@ -2307,6 +2307,7 @@
</section>
+<!--
<section id="account">
<h3>Account</h3>
@@ -2335,7 +2336,7 @@
<span class="name">)</span>
</div>
-<p>It is also useful to package up one or more account expressions in an expression container, for interchange purpose. Hence, <span class="nonterminal">expressionContainer</span> is revised as follows. </p>
+<p>It is also useful to package up one or more account expressions in an toplevel bundle, for interchange purpose. Hence, <span class="nonterminal">expressionContainer</span> is revised as follows. </p>
<div class='grammar'>
<span class="nonterminal">expressionContainer</span> ::=
@@ -2395,6 +2396,8 @@
</section>
+-->
+
<section id="media-type">
<h3>Media Type</h3>