renamed toplevel bundle to document
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Tue, 16 Oct 2012 09:35:57 +0100
changeset 4526 dc49694f142f
parent 4525 b6f71383b149
child 4527 8960e2aa8229
child 4528 7eeff918335f
renamed toplevel bundle to document
model/diff-n.html
model/grammar/ll.html
model/grammar/ll.js
model/grammar/yack/prov-n-LL.bnf
model/grammar/yack/prov-n-LL.bnf.html
model/prov-n.html
--- a/model/diff-n.html	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/diff-n.html	Tue Oct 16 09:35:57 2012 +0100
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
 <html lang="en" dir="ltr">
 <head><style type="text/css"><!--
@@ -967,7 +968,7 @@
 pre.sh_sourceCode .sh_attribute { color: #006400; }
 
 </style><link href="./extra.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head> 
-  <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-N: The Provenance Notation</h1><h2 id="subtitle"><a href="diff-n.html"><span class="insert">Diffs</span></a><span class="insert"> since LC Release </span></h2><h2 id="w3c-editor-s-draft-06-august-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">06 August</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-n-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-n/">http://www.w3.org/TR/prov-n/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-n-20120503/</span><span class="delete">  (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-n-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-n-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
+  <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-N: The Provenance Notation</h1><h2 id="subtitle"><a href="diff-n.html"><span class="insert">Diffs</span></a><span class="insert"> since LC Release </span></h2><h2 id="w3c-editor-s-draft-16-october-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">16 October</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-n-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-n/">http://www.w3.org/TR/prov-n/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-n-20120503/</span><span class="delete">  (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-n-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-n-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
 <dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
 <dt><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://homepages.inf.ed.ac.uk/jcheney/">James Cheney</a>, University of Edinburgh</dd>
 <dd><a href="http://soiland-reyes.com/stian/">Stian Soiland-Reyes</a>, University of Manchester</dd>
@@ -1026,7 +1027,7 @@
 <li>Readers seeking to implement other PROV serializations
 should focus on PROV-DM and PROV-CONSTRAINTS.  PROV-O and PROV-N offer examples of mapping to RDF and text, respectively.</li>
 </ul>
-<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Last Call Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-comments@w3.org">public-prov-comments@w3.org</a> (<a href="mailto:public-prov-comments-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>).<span class="delete"> The Last Call period ends 18 September 2012.</span> All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.<span class="delete">This is a Last Call Working Draft and thus the Working Group has determined that this document has satisfied the relevant technical requirements and is sufficiently stable to advance through the Technical Recommendation process.</span></p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and Target Audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno">2.3 </span>Main Productions</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.4 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.5 </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno">2.6 </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-primary-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle Constructor</a></li><li class="tocline"><a href="#expression-bundle-type" class="tocxref"><span class="secno">3.4.2 </span>Bundle Type</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li><li class="tocline"><a href="#semantic-rules-summary" class="tocxref"><span class="secno">3.7.5 </span>Summary of additional semantic rules</a></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span>Toplevel Bundle</a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno">5. </span>Extensibility</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div> 
+<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Last Call Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-comments@w3.org">public-prov-comments@w3.org</a> (<a href="mailto:public-prov-comments-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>).<span class="delete"> The Last Call period ends 18 September 2012.</span> All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.<span class="delete">This is a Last Call Working Draft and thus the Working Group has determined that this document has satisfied the relevant technical requirements and is sufficiently stable to advance through the Technical Recommendation process.</span></p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and Target Audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno">2.3 </span>Main Productions</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.4 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.5 </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno">2.6 </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-primary-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle Constructor</a></li><li class="tocline"><a href="#expression-bundle-type" class="tocxref"><span class="secno">3.4.2 </span>Bundle Type</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li><li class="tocline"><a href="#semantic-rules-summary" class="tocxref"><span class="secno">3.7.5 </span>Summary of additional semantic rules</a></li></ul></li></ul></li><li class="tocline"><a href="#document" class="tocxref"><span class="secno">4. </span><span class="delete">Toplevel Bundle</span><span class="insert">Document</span></a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno">5. </span>Extensibility</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#changes-since-last-version" class="tocxref"><span class="secno"><span class="insert">A. </span></span><span class="insert">Changes since last version</span></a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno"><span class="delete">A.</span><span class="insert">B.</span> </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno"><span class="delete">B.</span><span class="insert">C.</span> </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno"><span class="delete">B.1</span><span class="insert">C.1</span> </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno"><span class="delete">B.2</span><span class="insert">C.2</span> </span>Informative references</a></li></ul></li></ul></div> 
 
 
 
@@ -1073,7 +1074,7 @@
 <p>Its target audience is twofold:
 </p><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 
-<code><a class="grammarRef" href="#prod-bundle">bundle</a></code>.</li>
+<code><span class="delete">bundle</span><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code>.</li>
 <li>Readers of the  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] and of  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>] 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  <code><a class="grammarRef" href="#prod-expression">expression</a></code> nonterminal a useful entry point into the grammar.</li>
 </ul>
 
@@ -1088,7 +1089,7 @@
 
 <p><a href="#prov-n-expressions">Section 3</a> presents the grammar of all expressions of the language grouped according to the PROV data model components.</p>
 
-<p><a href="#toplevelBundle">Section 4</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="#document">Section 4</a> defines the grammar of <span class="delete">toplevel bundles,</span><span class="insert">document,</span> a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
 
 <p><a href="#extensibility">Section 5</a> defines the extensibility mechanism for the PROV-N notation.</p>
 
@@ -1257,14 +1258,14 @@
 
 
 </p><table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">expression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-extensibilityExpression">extensibilityExpression</a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression"><span class="insert">dictMembershipExpression</span></a></span> )</code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">expression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-extensibilityExpression">extensibilityExpression</a></span> )</code></td> </tr> </tbody>
 </table>
 
 
 <p>Each of the symbols included in <code>expression</code> above, i.e., <code><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></code>,  <code><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></code> etc., corresponds to one concept (e.g., Entity, Activity, etc.) of the PROV data model.</p>
 
 
-<p>Alternatively,  the production rule <code><a href="#prod-bundle"><span class="grammarRef">bundle</span></a></code>
+<p>Alternatively,  the production rule <code><a href="#prod-document"><span class="grammarRef"><span class="delete">bundle</span><span class="insert">document</span></span></a></code>
 provides the overall structure of PROV-N descriptions.  It is a wrapper  for
  a set of expressions, such that the text for an element matches the corresponding <code><a class="grammarRef" href="#prod-expression">expression</a></code> production,  and some namespace declarations.</p>
 
@@ -1330,9 +1331,9 @@
 
 
 <div class="anexample" id="example_10"><div class="anexampleTitle"><a class="internalDFN" href="#example_10">Example 10</a></div>
-<p>The first and second activity expressions have no attributes, and are equivalent.
-
-The third activity expression has two attributes. 
+<p>The first and second activity expressions <span class="delete">have no</span><span class="insert">do not speciy any</span> attributes, and are equivalent.
+
+The third activity expression <span class="delete">has</span><span class="insert">specifies</span> two attributes. 
 </p><pre class="codeexample">activity(ex:a1)
 activity(ex:a1, [])
 activity(ex:a1, [ex:param1="a", ex:param2="b"])
@@ -1386,8 +1387,8 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Entity</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#entity.id"><span class="attribute" id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#entity.attributes"><span class="attribute" id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.id"><span class="attribute" id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.attributes"><span class="attribute" id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1422,15 +1423,15 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Activity</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#activity.id"><span class="attribute" id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#activity.startTime"><span class="attribute" id="activity.startTime">startTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#activity.endTime"><span class="attribute" id="activity.endTime">endTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#activity.attributes"><span class="attribute" id="activity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.id"><span class="attribute" id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.startTime"><span class="attribute" id="activity.startTime">startTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.endTime"><span class="attribute" id="activity.endTime">endTime</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.attributes"><span class="attribute" id="activity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1474,13 +1475,13 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Generation</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.id"><span class="attribute" id="generation.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.entity"><span class="attribute" id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.activity"><span class="attribute" id="generation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.time"><span class="attribute" id="generation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.attributes"><span class="attribute" id="generation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="attribute" id="generation.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/#generation.entity"><span class="attribute" id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class="attribute" id="generation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.time"><span class="attribute" id="generation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.attributes"><span class="attribute" id="generation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1526,13 +1527,13 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Usage</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.id"><span class="attribute" id="usage.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.activity"><span class="attribute" id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.entity"><span class="attribute" id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.time"><span class="attribute" id="usage.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.attributes"><span class="attribute" id="usage.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute" id="usage.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/#usage.activity"><span class="attribute" id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute" id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute" id="usage.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute" id="usage.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1577,10 +1578,10 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Communication</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#communication.id"><span class="attribute" id="communication.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#communication.informed"><span class="attribute" id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#communication.informant"><span class="attribute" id="communication.informant">informant</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#communication.attributes"><span class="attribute" id="communication.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class="attribute" id="communication.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/#communication.informed"><span class="attribute" id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informant"><span class="attribute" id="communication.informant">informant</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.attributes"><span class="attribute" id="communication.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1617,15 +1618,15 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Start</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.id"><span class="attribute" id="start.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.activity"><span class="attribute" id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.trigger"><span class="attribute" id="start.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.starter"><span class="attribute" id="start.starter">starter</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.time"><span class="attribute" id="start.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.attributes"><span class="attribute" id="start.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="attribute" id="start.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/#start.activity"><span class="attribute" id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.trigger"><span class="attribute" id="start.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.starter"><span class="attribute" id="start.starter">starter</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.time"><span class="attribute" id="start.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#start.attributes"><span class="attribute" id="start.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1671,15 +1672,15 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>End</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.id"><span class="attribute" id="end.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.activity"><span class="attribute" id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.trigger"><span class="attribute" id="end.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.ender"><span class="attribute" id="end.ender">ender</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.time"><span class="attribute" id="end.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.attributes"><span class="attribute" id="end.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute" id="end.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/#end.activity"><span class="attribute" id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class="attribute" id="end.trigger">trigger</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.ender"><span class="attribute" id="end.ender">ender</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute" id="end.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute" id="end.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1732,13 +1733,13 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Invalidation</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.id"><span class="attribute" id="invalidation.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.entity"><span class="attribute" id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.activity"><span class="attribute" id="invalidation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.time"><span class="attribute" id="invalidation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.attributes"><span class="attribute" id="invalidation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute" id="invalidation.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/#invalidation.entity"><span class="attribute" id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class="attribute" id="invalidation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute" id="invalidation.time">time</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute" id="invalidation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1790,22 +1791,22 @@
 <tbody><tr><td><b>Derivation</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.id"><span class="attribute" id="derivation.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.generatedEntity"><span class="attribute" id="derivation.generatedEntity">generatedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.usedEntity"><span class="attribute" id="derivation.usedEntity">usedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.activity"><span class="attribute" id="derivation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.generation"><span class="attribute" id="derivation.generation">generation</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.usage"><span class="attribute" id="derivation.usage">usage</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></code></td></tr>
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#derivation.attributes"><span class="attribute" id="derivation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.id"><span class="attribute" id="derivation.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/#derivation.generatedEntity"><span class="attribute" id="derivation.generatedEntity">generatedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.usedEntity"><span class="attribute" id="derivation.usedEntity">usedEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.activity"><span class="attribute" id="derivation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.generation"><span class="attribute" id="derivation.generation">generation</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.usage"><span class="attribute" id="derivation.usage">usage</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></code></td></tr>
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.attributes"><span class="attribute" id="derivation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1927,8 +1928,8 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Agent</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#agent.id"><span class="attribute" id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#agent.attributes"><span class="attribute" id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.id"><span class="attribute" id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.attributes"><span class="attribute" id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -1971,12 +1972,12 @@
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Attribution</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#attribution.id"><span class="attribute" id="attribution.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#attribution.entity"><span class="attribute" id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">eIdentifier</a></code></td></tr>
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#attribution.agent"><span class="attribute" id="attribution.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#attribution.attributes"><span class="attribute" id="attribution.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.id"><span class="attribute" id="attribution.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/#attribution.entity"><span class="attribute" id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.agent"><span class="attribute" id="attribution.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.attributes"><span class="attribute" id="attribution.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -2017,16 +2018,16 @@
 <tbody><tr><td><b>Association</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.id"><span class="attribute" id="association.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.activity"><span class="attribute" id="association.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.agent"><span class="attribute" id="association.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifierOrMarker">agIdentifierOrMarker</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.plan"><span class="attribute" id="association.plan">plan</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.attributes"><span class="attribute" id="association.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="attribute" id="association.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/#association.activity"><span class="attribute" id="association.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.agent"><span class="attribute" id="association.agent">agent</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifierOrMarker">agIdentifierOrMarker</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.plan"><span class="attribute" id="association.plan">plan</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.attributes"><span class="attribute" id="association.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -2080,17 +2081,17 @@
 <tbody><tr><td><b>Delegation</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#delegation.id"><span class="attribute" id="delegation.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#delegation.delegate"><span class="attribute" id="delegation.delegate">delegate</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#delegation.responsible"><span class="attribute" id="delegation.responsible">responsible</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#delegation.activity"><span class="attribute" id="delegation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
-
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#delegation.attributes"><span class="attribute" id="delegation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.id"><span class="attribute" id="delegation.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/#delegation.delegate"><span class="attribute" id="delegation.delegate">delegate</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.responsible"><span class="attribute" id="delegation.responsible">responsible</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.activity"><span class="attribute" id="delegation.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></code></td></tr>
+
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.attributes"><span class="attribute" id="delegation.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -2134,13 +2135,13 @@
 <tbody><tr><td><b>Influence</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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#influence.id"><span class="attribute" id="influence.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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#influence.influencee"><span class="attribute" id="influence.influencee">influencee</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#influence.influencer"><span class="attribute" id="influence.influencer">influencer</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#influence.attributes"><span class="attribute" id="influence.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class="attribute" id="influence.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/#influence.influencee"><span class="attribute" id="influence.influencee">influencee</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.influencer"><span class="attribute" id="influence.influencer">influencer</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.attributes"><span class="attribute" id="influence.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
 </tbody></table>
 </div>
 
@@ -2173,12 +2174,12 @@
 <h4><span class="secno">3.4.1 </span>Bundle Constructor</h4>
 
 <table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">namedBundle</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* "endBundle"</code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-bundle" name="prod-bundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod"><span class="delete">namedBundle</span><span class="insert">bundle</span></code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* "endBundle"</code></td> </tr> </tbody>
 </table>
 
-<p>Named bundles cannot be nested because <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> is not an <code><a class="grammarRef" href="#prod-expression">expression</a></code>, and therefore cannot occurs inside another <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code>.</p>
-
-<p>Named bundles are self-contained: each identifier occuring in a named bundle, including the bundle identifier itself, <em class="rfc2119" title="must">must</em> be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a named bundle, there <em class="rfc2119" title="must">must</em> be a namespace declaration for <code>p</code> in this named bundled; for every identifier  without prefix, there <em class="rfc2119" title="must">must</em> be a default namespace declaration  in this named bundled.</p>
+<p><span class="delete">Named bundles</span><span class="insert">Bundles</span> cannot be nested because <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> is not an <code><a class="grammarRef" href="#prod-expression">expression</a></code>, and therefore cannot occurs inside another <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code>.</p>
+
+<p><span class="delete">Named bundles</span><span class="insert">Bundles</span> are self-contained: each identifier occuring in a<span class="delete"> named</span> bundle, including the bundle identifier itself, <em class="rfc2119" title="must">must</em> be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a <span class="delete">named </span>bundle, there <em class="rfc2119" title="must">must</em> be a namespace declaration for <code>p</code> in this <span class="delete">named </span>bundled; for every identifier  without prefix, there <em class="rfc2119" title="must">must</em> be a default namespace declaration  in this <span class="delete">named bundled.</span><span class="insert">bundle.</span></p>
 
 <div class="anexample" id="example_28"><div class="anexampleTitle"><a class="internalDFN" href="#example_28">Example 28</a></div>
     <pre class="codeexample">bundle ex:author-view
@@ -2229,10 +2230,10 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#alternate.alternate1"><span class="attribute" id="alternate.alternate1">alternate1</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#alternate.alternate2"><span class="attribute" id="alternate.alternate2">alternate2</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate1"><span class="attribute" id="alternate.alternate1">alternate1</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate2"><span class="attribute" id="alternate.alternate2">alternate2</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
 
 </tbody></table>
 </div>
@@ -2264,10 +2265,10 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
 
 </tbody></table>
 </div>
@@ -2307,12 +2308,12 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#mention.specificEntity"><span class="attribute" id="mention.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#mention.generalEntity"><span class="attribute" id="mention.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#mention.bundle"><span class="attribute" id="mention.bundle">bundle</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.specificEntity"><span class="attribute" id="mention.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.generalEntity"><span class="attribute" id="mention.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.bundle"><span class="attribute" id="mention.bundle">bundle</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
 
 </tbody></table>
 </div>
@@ -2371,9 +2372,9 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
-<tr><td><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#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://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#membership.entity"><span class="attribute" id="membership.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</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.entity"><span class="attribute" id="membership.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
 
 
 </tbody></table>
@@ -2476,12 +2477,12 @@
 
  
 <table class="grammar">
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">QUALIFIED_NAME</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br> | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":"</code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_LOCAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_CHARS_OTHERS</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"/"<br> | "@"<br> | "~"<br> | "&amp;"<br> | "+"<br> | "*"<br> | "?"<br> | "#"<br> | "$"<br> | "!"<br> | <span class="prod"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_ESC">PN_CHARS_ESC</a></span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_ESC" name="prod-PN_CHARS_ESC"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_CHARS_ESC</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"\" ( "=" | "'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )</code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PERCENT</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">HEX</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">[0-9]<br> | [A-F]<br> | [a-f]</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo"><span class="delete">61</span><span class="insert">54</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">QUALIFIED_NAME</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br> | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":"</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo"><span class="delete">62</span><span class="insert">55</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_LOCAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo"><span class="delete">63</span><span class="insert">56</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_CHARS_OTHERS</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"/"<br> | "@"<br> | "~"<br> | "&amp;"<br> | "+"<br> | "*"<br> | "?"<br> | "#"<br> | "$"<br> | "!"<br> | <span class="prod"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_ESC">PN_CHARS_ESC</a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_ESC" name="prod-PN_CHARS_ESC"></a>[<span class="prodNo"><span class="delete">64</span><span class="insert">57</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PN_CHARS_ESC</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"\" ( "=" | "'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo"><span class="delete">65</span><span class="insert">58</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">PERCENT</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo"><span class="delete">66</span><span class="insert">59</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">HEX</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">[0-9]<br> | [A-F]<br> | [a-f]</code></td> </tr> </tbody>
 
 </table>
 
@@ -2489,7 +2490,7 @@
 
 <div class="anexample" id="anexample-qualified-name"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-qualified-name">Example 33</a></div>
 <p>Examples of articles on the BBC Web site seen as  entities.</p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   prefix bbc &lt;http://www.bbc.co.uk/&gt;
   prefix bbcNews &lt;http://www.bbc.co.uk/news/&gt;
 
@@ -2499,14 +2500,14 @@
 
   entity(bbcNews:)                      // an alternative way of referring to the bbc news site
 
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </pre>
 </div>
 
 
 <div class="anexample" id="anexample-qualified-name2"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-qualified-name2">Example 34</a></div>
 <p>Examples of entities with declared and default namespace.</p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   default &lt;http://example.org/2/&gt;
   prefix ex &lt;http://example.org/1/&gt;
 
@@ -2518,14 +2519,14 @@
   entity(4567)     //  corresponds to IRI http://example.org/2/4567
   entity(c/)       //  corresponds to IRI http://example.org/2/c/
   entity(ex:/)     //  corresponds to IRI http://example.org/1//
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </pre>
 </div>
 
 
 <div class="anexample" id="anexample-qualified-name3"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-qualified-name3">Example 35</a></div>
 <p>Examples of \-escaped characters.</p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   prefix ex &lt;http://example.org/&gt;
   default &lt;http://example.org/default&gt;
 
@@ -2535,7 +2536,7 @@
 
   used(-;a1,e1,-)                // identifier not specified for usage  
   used(\-;a1,e1,-)               // usage identifier corresponds to http://example.org/default-
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </pre>
 </div>
 
@@ -2561,7 +2562,7 @@
 
 
 <p>The  reserved attributes in the PROV namespace are the following.
-Their meaning is explained by [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] (see <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#term-attribute">Section 5.7.2: Attribute</a>).
+Their meaning is explained by [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] (see <a href="http://www.w3.org/TR/prov-dm/#term-attribute">Section 5.7.2: Attribute</a>).
 </p>
 
 <ol>
@@ -2590,13 +2591,13 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">44</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">datatype</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> </tr> </tbody>
 <tbody><tr valign="baseline"><td></td><td></td><td></td></tr></tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">45</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">convenienceNotation</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span> (<span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rLANGTAG">LANGTAG</a></span>)?<br> | <span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2">STRING_LITERAL2</a></span><br> | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL_LONG2">STRING_LITERAL_LONG2</a></span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">DIGIT</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">[0-9]</code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo"><span class="delete">67</span><span class="insert">60</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2">STRING_LITERAL2</a></span><br> | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL_LONG2">STRING_LITERAL_LONG2</a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo"><span class="delete">69</span><span class="insert">62</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo"><span class="delete">71</span><span class="insert">64</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">DIGIT</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">[0-9]</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo"><span class="delete">70</span><span class="insert">63</span></span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td> </tr> </tbody>
 </table>
 
-<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#term-value">PROV data type</a> [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>].
+<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://www.w3.org/TR/prov-dm/#term-value">PROV data type</a> [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>].
 
 
 </p><p>The non terminals
@@ -2659,7 +2660,7 @@
 <h5><span class="secno">3.7.3.1 </span>Reserved Type Values</h5>
 
 <p>The  reserved type values in the PROV namespace are the following.
-Their meaning is defined [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] (see <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#term-attribute-type">Section 5.7.2.4: prov:type</a>).
+Their meaning is defined [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] (see <a href="http://www.w3.org/TR/prov-dm/#term-attribute-type">Section 5.7.2.4: prov:type</a>).
 </p>
 
 <ol>
@@ -2732,9 +2733,9 @@
 A <code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></code> consists of a namespace. Every qualified name without prefix in the scope of this declaration belongs to this namespace. Scope of a declaration is specified as follows:</p>
 <ul>
 <li> 
-The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> is the <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> itself;</li>
+The scope of a namespace declaration directly occurring in a <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> is the <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> itself;</li>
 <li>
-the scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-bundle">toplevel bundle</a></code> is the <code><a class="grammarRef" href="#prod-bundle">toplevel bundle</a></code> itself, except and <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> it may contain.</li>
+the scope of a namespace declaration directly occurring in a <code><span class="delete">toplevel bundle</span><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code> is<span class="insert"> the </span><code><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code><span class="insert"> itself, except</span> the <code><a class="grammarRef" href="#prod-bundle"><span class="delete">toplevel bundle</span><span class="delete"> itself, except and </span><span class="delete">namedBundle</span><span class="insert">bundles</span></a></code> it may contain.</li>
 </ul>
 
 <p>A set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code> <em class="rfc2119" title="must not">must not</em> re-declare the same prefix.</p>
@@ -2745,23 +2746,25 @@
 
 <div class="anexample" id="anexample-namespace"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-namespace">Example 40</a></div>
 <p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   default &lt;http://example.org/0/&gt;
   prefix ex1 &lt;http://example.org/1/&gt;
   prefix ex2 &lt;http://example.org/2/&gt;
 ...
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </pre>
 </div>
 
 
 <div class="anexample" id="anexample-namespace-scope"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-namespace-scope">Example 41</a></div>
-<p>In the following example, a toplevel bundle declares a default namespace and the occurrence of
-<code>e001</code> directly occurring in the toplevel bundle refers to that namespace.
+<p>In the following example, a <span class="delete">toplevel bundle</span><span class="insert">document</span> declares a default namespace and the occurrence of
+<code>e001</code> directly occurring in the <span class="delete">toplevel</span><span class="insert">document refers to that namespace.
+A nested</span> bundle <span class="delete">refers to</span><span class="insert">also declares a default namespace, but with a different IRI.
+In</span> that<span class="delete"> namespace.
 A nested named bundle also declares a default namespace, but with a different IRI.
-In that named bundle, the occurrences of
+In that named </span>  bundle, the occurrences of
 <code>e001</code>, including for the bundle name, refer to the latest default namespace.</p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   default &lt;http://example.org/1/&gt;
   entity(e001)                             // IRI: http://example.org/1/e001
 
@@ -2769,7 +2772,7 @@
     default &lt;http://example.org/2/&gt;
     entity(e001)                           // IRI: http://example.org/2/e001
   endBundle
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </pre>
 </div>
 
@@ -2798,33 +2801,33 @@
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a class="grammarRef" href="#prod-generationExpression">Generation expression</a></td>
     <td><span class="name">wasGeneratedBy(e2, -, -)</span><br><span class="name">wasGeneratedBy(-; e2, -, -)</span></td>
-    <td>At least one  of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.activity"><span class="attribute">activity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.time"><span class="attribute">time</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#generation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</td>  
+    <td>At least one  of <a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class="attribute">activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#generation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</td>  
 </tr>
 <tr><td><a class="grammarRef" href="#prod-usageExpression">Usage expression</a></td>
 <td><span class="name">used(a2, -, -)</span><br><span class="name">used(-; a2, -, -)</span></td>
-<td>At least one  of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.entity"><span class="attribute">entity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.time"><span class="attribute">time</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
+<td>At least one  of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute">entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
 </tr><tr>
 <td><a class="grammarRef" href="#prod-startExpression">Start expression</a></td>
 <td> <span class="name">wasStartedBy(e2, -, -, -)</span><br><span class="name">wasStartedBy(-; e2, -, -, -)</span></td>
-<td>At least one  of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.trigger"><span class="attribute">trigger</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.starter"><span class="attribute">starter</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.time"><span class="attribute">time</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#start.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
+<td>At least one  of <a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.trigger"><span class="attribute">trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.starter"><span class="attribute">starter</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#start.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
 </tr>
 
 <tr>
 <td><a class="grammarRef" href="#prod-endExpression">End expression</a></td>
 <td><span class="name">wasEndedBy(e2, -, -, -)</span><br><span class="name">wasEndedBy(-; e2, -, -, -)</span></td>
-<td>At least one  of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.trigger"><span class="attribute">trigger</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.ender"><span class="attribute">ender</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.time"><span class="attribute">time</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#end.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
+<td>At least one  of <a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class="attribute">trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.ender"><span class="attribute">ender</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
 </tr>
 
 <tr>
 <td><a class="grammarRef" href="#prod-invalidationExpression">Invalidation expression</a></td>
 <td><span class="name">wasInvalidatedBy(e2, -, -)</span>  <br><span class="name">wasInvalidatedBy(-; e2, -, -)</span></td>
-<td>At least one  of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.activity"><span class="attribute">activity</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.time"><span class="attribute">time</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#invalidation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
+<td>At least one  of <a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class="attribute">activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present</td>
 </tr>
 
 <tr>
 <td><a class="grammarRef" href="#prod-associationExpression">Association expression</a></td>
 <td><span class="name">wasAssociatedWith(a, -, -)</span> <br><span class="name">wasAssociatedWith(-; a, -, -)</span></td>
-<td>At least one of <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.id"><span class="attribute">id</span></a>, <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.agent"><span class="attribute">agent</span></a>,  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.plan"><span class="attribute">plan</span></a>, and  <a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/WD-prov-dm-20120724/Overview.html#association.attributes"><span class="attribute">attributes</span></a>  <em class="rfc2119" title="must">must</em> be present</td>
+<td>At least one of <a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#association.agent"><span class="attribute">agent</span></a>,  <a href="http://www.w3.org/TR/prov-dm/#association.plan"><span class="attribute">plan</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#association.attributes"><span class="attribute">attributes</span></a>  <em class="rfc2119" title="must">must</em> be present</td>
 </tr>
 
 </tbody></table>
@@ -2840,45 +2843,45 @@
 
 
 
-<div id="toplevelBundle" class="section">
-<h2><span class="secno">4. </span>Toplevel Bundle</h2>
-
-<p>A <dfn id="dfn-toplevel-bundle">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
+<div id="document" class="section">
+<h2><span class="secno">4. </span><span class="delete">Toplevel Bundle</span><span class="insert">Document</span></h2>
+
+<p>A <span class="delete">toplevel bundle</span><dfn id="dfn-document"><span class="insert">document</span></dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations.  A <span class="delete">toplevel bundle</span><span class="insert">document</span> forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them.  A <span class="delete">toplevel bundle</span><span class="insert">document</span> may be used
  to  package up PROV-N <a title="record">expressions</a> in response to a request for the provenance of something ([<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ">PROV-AQ</a></cite>]).</p>
 
-<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 <code class="content"><a class="grammarRef" href="#prod-expression">expression</a></code>).</p> 
-
-
-
-
-
-<p>A toplevel bundle's text matches the <code class="content"><a class="grammarRef" href="#prod-bundle">bundle</a></code> production.</p>
+<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions,  a <span class="delete">toplevel bundle</span><span class="insert">document</span> is not defined as a PROV-N expression (production <code class="content"><a class="grammarRef" href="#prod-expression">expression</a></code>).</p> 
+
+
+
+
+
+<p>A <span class="delete">toplevel bundle's</span><span class="insert">document's</span> text matches the <code class="content"><span class="delete">bundle</span><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code> production.</p>
 
 <table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-bundle" name="prod-bundle"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">bundle</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"bundle" (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></span>)* "endBundle"</code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-document" name="prod-document"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod"><span class="delete">bundle</span><span class="insert">document</span></code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="delete">"bundle"</span><span class="insert">"document"</span> (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* (<span class="prod"><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></span>)* <span class="delete">"endBundle"</span><span class="insert">"endDocument"</span></code></td> </tr> </tbody>
 </table>
 
-<p>A toplevel bundle contains:
+<p>A <span class="delete">toplevel bundle</span><span class="insert">document</span> contains:
 </p><ul>
 <li><em>namespaceDeclarations</em>: a set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code>, 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 set of expressions matching <code><a class="grammarRef" href="#prod-expression">expression</a></code>;</li>
-<li><em>namedBundles</em>:  a  set of
-<code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code>.</li>
+<li><em><span class="delete">namedBundles</span><span class="insert">bundles</span></em>:  a  set of
+<code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code>.</li>
 </ul>
 
 
-<p>Thus, named bundles can occur inside a toplevel bundle. 
-Named bundles are self-contained: each identifier occuring in a named bundle, including the named bundle's identifier itself, <em class="rfc2119" title="must">must</em> be interpreted with respect to the namespace declarations of that named bundle. In other words, named bundles <em class="rfc2119" title="should">should</em> not inherit namespaces declarations from the toplevel bundle.
+<p>Thus, <span class="delete">named </span>bundles can occur inside a <span class="delete">toplevel bundle.</span><span class="insert">document.</span> 
+<span class="delete">Named bundles</span><span class="insert">Bundles</span> are self-contained: each identifier occuring in a <span class="delete">named </span>bundle, including the<span class="delete"> named</span> bundle's identifier itself, <em class="rfc2119" title="must">must</em> be interpreted with respect to the namespace declarations of that<span class="delete"> named </span>  bundle. In other words,<span class="delete"> named </span>  bundles <em class="rfc2119" title="should">should</em> not inherit namespaces declarations from the <span class="delete">toplevel bundle.</span><span class="insert">document.</span>
 </p>
 
 
 
 <div class="anexample" id="example_42"><div class="anexampleTitle"><a class="internalDFN" href="#example_42">Example 42</a></div>
 <p>
-The following bundle contains expressions related to the provenance of entity 
+The following <span class="delete">bundle</span><span class="insert">document</span> contains expressions related to the provenance of entity 
 <span class="name">e2</span>.
 </p>
-<pre class="codeexample">bundle
+<pre class="codeexample"><span class="delete">bundle</span><span class="insert">document</span>
   default &lt;http://anotherexample.org/&gt;
   prefix ex &lt;http://example.org/&gt;
 
@@ -2889,7 +2892,7 @@
   wasAssociatedWith(a1, ag2, -, [prov:role="author"])
   agent(ag2, [ prov:type='prov:Person', ex:name="Bob" ])
 
-endBundle
+<span class="delete">endBundle</span><span class="insert">endDocument</span>
 </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> [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ">PROV-AQ</a></cite>].  
 </p>
@@ -2928,7 +2931,7 @@
 
 <div class="anexample" id="example_43"><div class="anexampleTitle"><a class="internalDFN" href="#example_43">Example 43</a></div>
 <p>
-<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">hadMember</span> relation.  The following example shows how one can express membership for an extension of Collections, namely sets of key-value pairs. The notation is a variation of that used for Collections membership, allowing multiple member elements to be declared, and in which the elements are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
+<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">hadMember</span> relation.  The following example shows how one can express membership for <em><span class="insert">dictionaries</span></em><span class="insert">, </span>an <span class="insert">illustrative </span>extension of <span class="delete">Collections, namely</span><span class="insert">Collections consisting of</span> sets of <span class="delete">key-value pairs.</span><span class="insert">key-entity pairs, where a key is a </span><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a><span class="insert">.</span> The notation is a variation of that used for Collections membership, allowing multiple member elements to be declared, and in which the elements are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
 </p>
 <pre class="codeexample">  prefix dictExt &lt;http://example.org/dictionaries&gt;
   dictExt:hadMembers(mId; d, {("k1",e1), ("k2",e2), ("k3",e3)}, []) 
@@ -2952,6 +2955,9 @@
 
 
 
+
+
+
 <div id="media-type" class="section">
 <h2><span class="secno">6. </span>Media Type</h2>
 
@@ -3015,7 +3021,7 @@
       <dd>No widely deployed applications are known to use this media type. It may be used by some web services and clients consuming their data.</dd> 
       <dt>Additional information:</dt> 
       <dt>Magic number(s):</dt> 
-      <dd>PROV-N documents may have the strings 'bundle' near the beginning of the document.</dd> 
+      <dd>PROV-N documents may have the strings <span class="delete">'bundle'</span><span class="insert">'document'</span> near the beginning of the document.</dd> 
       <dt>File extension(s):</dt> 
       <dd>".provn"</dd> 
       <dt>Base URI:</dt> 
@@ -3040,8 +3046,17 @@
 
 
 
+<div class="appendix section" id="changes-since-last-version"> 
+      <h2><span class="secno"><span class="insert">A. </span></span><span class="insert">Changes since last version</span></h2> 
+      <p> 
+</p><ul>
+<p> <a href="http://www.w3.org/2011/prov/track/issues/543"><span class="insert">ISSUE-543</span></a><span class="insert">: uses key-entity pair terminology for example 43.
+</span></p><p> <a href="http://www.w3.org/2011/prov/track/issues/538"><span class="insert">ISSUE-538</span></a><span class="insert">: rephrasing of text in example 10.
+</span></p></ul>
+</div>
+
 <div class="appendix section" id="acknowledgements"> 
-      <h2><span class="secno">A. </span>Acknowledgements</h2> 
+      <h2><span class="secno"><span class="delete">A.</span><span class="insert">B.</span> </span>Acknowledgements</h2> 
       <p> 
 
 This  document has been produced by the PROV Working Group, and its contents reflect extensive discussion within the Working Group as a whole. 
@@ -3113,7 +3128,7 @@
 
 
  
-<div id="references" class="appendix section"><h2><span class="secno">B. </span>References</h2><div id="normative-references" class="section"><h3><span class="secno">B.1 </span>Normative references</h3><dl class="bibliography"><dt id="bib-IRI">[IRI]</dt><dd>M. Duerst, M. Suignard. <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers (IRI).</cite></a> January 2005. Internet RFC 3987. URL: <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3987.txt</a> 
+<div id="references" class="appendix section"><h2><span class="secno"><span class="delete">B.</span><span class="insert">C.</span> </span>References</h2><div id="normative-references" class="section"><h3><span class="secno"><span class="delete">B.1</span><span class="insert">C.1</span> </span>Normative references</h3><dl class="bibliography"><dt id="bib-IRI">[IRI]</dt><dd>M. Duerst, M. Suignard. <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers (IRI).</cite></a> January 2005. Internet RFC 3987. URL: <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3987.txt</a> 
 </dd><dt id="bib-RDF-SPARQL-QUERY">[RDF-SPARQL-QUERY]</dt><dd>Andy Seaborne; Eric Prud'hommeaux. <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115"><cite>SPARQL Query Language for RDF.</cite></a> 15 January 2008. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115">http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115</a> 
 </dd><dt id="bib-RFC2119">[RFC2119]</dt><dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key words for use in RFCs to Indicate Requirement Levels.</cite></a> March 1997. Internet RFC 2119.  URL: <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a> 
 </dd><dt id="bib-RFC3023">[RFC3023]</dt><dd>M. Murata; S. St.Laurent; D. Kohn. <a href="http://www.ietf.org/rfc/rfc3023.txt"><cite>XML Media Types</cite></a> January 2001. Internet RFC 3023. URL: <a href="http://www.ietf.org/rfc/rfc3023.txt">http://www.ietf.org/rfc/rfc3023.txt</a> 
@@ -3124,7 +3139,7 @@
 </dd><dt id="bib-XML-NAMES">[XML-NAMES]</dt><dd>Richard Tobin; et al. <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/"><cite>Namespaces in XML 1.0 (Third Edition).</cite></a> 8 December 2009. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/">http://www.w3.org/TR/2009/REC-xml-names-20091208/</a> 
 </dd><dt id="bib-XML11">[XML11]</dt><dd>Eve Maler; et al. <a href="http://www.w3.org/TR/2006/REC-xml11-20060816"><cite>Extensible Markup Language (XML) 1.1 (Second Edition).</cite></a> 16 August 2006. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2006/REC-xml11-20060816">http://www.w3.org/TR/2006/REC-xml11-20060816</a> 
 </dd><dt id="bib-XMLSCHEMA11-2">[XMLSCHEMA11-2]</dt><dd>Henry S. Thompson; et al. <a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/"><cite>W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes.</cite></a> 5 April 2012. W3C Recommendation URL: <a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/">http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/</a> 
-</dd></dl></div><div id="informative-references" class="section"><h3><span class="secno">B.2 </span>Informative references</h3><dl class="bibliography"><dt id="bib-PROV-AQ">[PROV-AQ]</dt><dd>Graham Klyne and Paul Groth (eds.) Luc Moreau, Olaf Hartig, Yogesh Simmhan, James Meyers, Timothy Lebo, Khalid Belhajjame, and Simon Miles <a href="http://www.w3.org/TR/prov-aq/"><cite>Provenance Access and Query</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-aq/">http://www.w3.org/TR/prov-aq/</a>
+</dd></dl></div><div id="informative-references" class="section"><h3><span class="secno"><span class="delete">B.2</span><span class="insert">C.2</span> </span>Informative references</h3><dl class="bibliography"><dt id="bib-PROV-AQ">[PROV-AQ]</dt><dd>Graham Klyne and Paul Groth (eds.) Luc Moreau, Olaf Hartig, Yogesh Simmhan, James Meyers, Timothy Lebo, Khalid Belhajjame, and Simon Miles <a href="http://www.w3.org/TR/prov-aq/"><cite>Provenance Access and Query</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-aq/">http://www.w3.org/TR/prov-aq/</a>
 </dd><dt id="bib-PROV-CONSTRAINTS">[PROV-CONSTRAINTS]</dt><dd>James Cheney, Paolo Missier, and Luc Moreau (eds.)<a href="http://www.w3.org/TR/prov-constraints/"><cite>Constraints of the Prov Data Model</cite></a>. 2012, Working Draft. URL: <a href="http://www.w3.org/TR/prov-constraints/">http://www.w3.org/TR/prov-constraints/</a>
 </dd><dt id="bib-PROV-DM">[PROV-DM]</dt><dd>Luc Moreau and Paolo Missier (eds.) Khalid Belhajjame, Reza B'Far, Stephen Cresswell, Yolanda Gil, Paul Groth, Graham Klyne, Jim McCusker, Simon Miles, James Myers, Satya Sahoo, and Curt Tilmes<a href="http://www.w3.org/TR/prov-dm/"><cite>PROV-DM: The PROV Data Model</cite></a>. 2012, Working Draft. URL: <a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a>
 </dd><dt id="bib-PROV-RDF">[PROV-RDF]</dt><dd>James Cheney<a href="http://www.w3.org/2011/prov/wiki/ProvRDF"><cite>PROV-RDF Mapping </cite></a>2012, Working in Progress. URL: <a href="http://www.w3.org/2011/prov/wiki/ProvRDF">http://www.w3.org/2011/prov/wiki/ProvRDF</a>
@@ -3134,3 +3149,5 @@
 </dd><dt id="bib-UNISEC">[UNISEC]</dt><dd> Mark Davis and Michel Suignard. <a href="http://www.unicode.org/reports/tr36/"><cite>Unicode Security Considerations<cite></cite></cite></a>.  4 August 2010. URL: <a href="http://www.unicode.org/reports/tr36/">http://www.unicode.org/reports/tr36/</a>
 </dd></dl></div></div></body></html>
 
+
+
--- a/model/grammar/ll.html	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/grammar/ll.html	Tue Oct 16 09:35:57 2012 +0100
@@ -4,10 +4,10 @@
 
 <tbody class="prod">
 <tr valign="baseline">
-<td><a id="prod-prov_n_LL-bundle" name="prod-prov_n_LL-bundle"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">bundle</code></td>
+<td><a id="prod-prov_n_LL-document" name="prod-prov_n_LL-document"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><code class="production prod">document</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"bundle" (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namedBundle">namedBundle</a></span>)* "endBundle"</code></td>
+<td><code class="content">"document" (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bundle">bundle</a></span>)* "endDocument"</code></td>
 </tr>
 </tbody>
 
@@ -16,7 +16,7 @@
 <td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">expression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityExpression">extensibilityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityExpression">extensibilityExpression</a></span> )</code></td>
 </tr>
 </tbody>
 
@@ -202,8 +202,8 @@
 
 <tbody class="prod">
 <tr valign="baseline">
-<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">namedBundle</code></td>
+<td><a id="prod-prov_n_LL-bundle" name="prod-prov_n_LL-bundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><code class="production prod">bundle</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* "endBundle"</code></td>
 </tr>
@@ -483,72 +483,9 @@
 </tr>
 </tbody>
 
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">dIdentifier</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">dictMembershipExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-removalExpression" name="prod-prov_n_LL-removalExpression"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">removalExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"derivedByRemovalFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keySet">keySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-insertionExpression" name="prod-prov_n_LL-insertionExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">insertionExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"derivedByInsertionFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-keyEntitySet" name="prod-prov_n_LL-keyEntitySet"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">keyEntitySet</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"{" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> ")" (( "," "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> ")" ))* "}"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-keySet" name="prod-prov_n_LL-keySet"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">keySet</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"{" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> ))* "}"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">complete</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">(( "," ( "true" | "false" | "-" ) ))?</code></td>
-</tr>
-</tbody>
-
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">QUALIFIED_NAME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">(( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":" ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_LOCAL">PN_LOCAL</a></span><br/>
@@ -558,7 +495,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_LOCAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
@@ -567,7 +504,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_OTHERS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"/"<br/>
@@ -587,7 +524,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_ESC" name="term-prov_n_LL-PN_CHARS_ESC"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_ESC" name="term-prov_n_LL-PN_CHARS_ESC"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_ESC</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"\\" ( "=" | "'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )</code></td>
@@ -596,7 +533,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PERCENT</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
@@ -605,7 +542,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">HEX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[0-9]<br/>
@@ -616,7 +553,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
@@ -626,7 +563,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PREFX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
@@ -635,7 +572,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
@@ -644,7 +581,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
@@ -653,7 +590,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">DIGIT</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[0-9]</code></td>
@@ -662,7 +599,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">DATETIME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
@@ -671,7 +608,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">TIMEZONEOFFSET</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
@@ -680,7 +617,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">IRI_REF</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"&lt;" (( [^&lt;&gt;\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* "&gt;"</code></td>
@@ -689,7 +626,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL2</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -698,7 +635,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL_LONG2</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -707,7 +644,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">LANGTAG</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"@" ([a-zA-Z])+ (( "-" ([a-zA-Z0-9])+ ))*</code></td>
@@ -716,7 +653,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">UCHAR</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -726,7 +663,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">ECHAR</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -735,7 +672,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">NIL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -744,7 +681,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">81</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">WS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">" "<br/>
@@ -756,7 +693,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">82</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">ANON</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -765,7 +702,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">83</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_BASE</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[A-Z]<br/>
@@ -787,7 +724,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">84</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_U</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -797,7 +734,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">85</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -811,7 +748,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">86</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_PREFIX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -820,7 +757,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">87</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production directive">PASSED TOKENS</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">([ \t\r\n])+<br/>
--- a/model/grammar/ll.js	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/grammar/ll.js	Tue Oct 16 09:35:57 2012 +0100
@@ -5,10 +5,10 @@
 ' ' + 
 '<tbody class="prod"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-bundle" name="prod-bundle"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">bundle</code></td> ' + 
+'<td><a id="prod-document" name="prod-document"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><code class="production prod">document</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"bundle" (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></span>)* "endBundle"</code></td> ' + 
+'<td><code class="content">"document" (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-bundle">bundle</a></span>)* "endDocument"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -17,7 +17,7 @@
 '<td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">expression</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-extensibilityExpression">extensibilityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td> ' + 
+'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-extensibilityExpression">extensibilityExpression</a></span> )</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -203,8 +203,8 @@
 ' ' + 
 '<tbody class="prod"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-namedBundle" name="prod-namedBundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">namedBundle</code></td> ' + 
+'<td><a id="prod-bundle" name="prod-bundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><code class="production prod">bundle</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* "endBundle"</code></td> ' + 
 '</tr> ' + 
@@ -484,72 +484,9 @@
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-dIdentifier" name="prod-dIdentifier"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">dIdentifier</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-dictMembershipExpression" name="prod-dictMembershipExpression"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">dictMembershipExpression</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-removalExpression" name="prod-removalExpression"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">removalExpression</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"derivedByRemovalFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-keySet">keySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-insertionExpression" name="prod-insertionExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">insertionExpression</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"derivedByInsertionFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">keyEntitySet</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"{" "(" <span class="prod"><a class="grammarRef" href="#prod-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> ")" ( "," "(" <span class="prod"><a class="grammarRef" href="#prod-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> ")" )* "}"</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-keySet" name="prod-keySet"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">keySet</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"{" <span class="prod"><a class="grammarRef" href="#prod-literal">literal</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-literal">literal</a></span> )* "}"</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
-'<tbody class="prod"> ' + 
-'<tr valign="baseline"> ' + 
-'<td><a id="prod-complete" name="prod-complete"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="production prod">complete</code></td> ' + 
-'<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">( "," ( "true" | "false" | "-" ) )?</code></td> ' + 
-'</tr> ' + 
-'</tbody> ' + 
-' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">QUALIFIED_NAME</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br/> ' + 
@@ -559,7 +496,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_LOCAL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> ' + 
@@ -568,7 +505,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_CHARS_OTHERS</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"/"<br/> ' + 
@@ -588,7 +525,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_CHARS_ESC" name="prod-PN_CHARS_ESC"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_CHARS_ESC" name="prod-PN_CHARS_ESC"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_CHARS_ESC</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"\\" ( "=" | "\'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )</code></td> ' + 
@@ -597,7 +534,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PERCENT</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> ' + 
@@ -606,7 +543,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">HEX</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">[0-9]<br/> ' + 
@@ -617,7 +554,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2">STRING_LITERAL2</a></span><br/> ' + 
@@ -627,7 +564,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PREFX</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span></code></td> ' + 
@@ -636,7 +573,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> ' + 
@@ -645,7 +582,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "\'"</code></td> ' + 
@@ -654,7 +591,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">DIGIT</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">[0-9]</code></td> ' + 
@@ -663,7 +600,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-DATETIME" name="prod-DATETIME"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-DATETIME" name="prod-DATETIME"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">DATETIME</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( "." <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)? )? )? ( "Z" | <span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> )?</code></td> ' + 
@@ -672,7 +609,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">TIMEZONEOFFSET</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span></code></td> ' + 
@@ -681,7 +618,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">IRI_REF</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"&lt;" ( [^&lt;&gt;\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* "&gt;"</code></td> ' + 
@@ -690,7 +627,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">STRING_LITERAL2</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></td> ' + 
@@ -699,7 +636,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-STRING_LITERAL_LONG2" name="prod-STRING_LITERAL_LONG2"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-STRING_LITERAL_LONG2" name="prod-STRING_LITERAL_LONG2"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">STRING_LITERAL_LONG2</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></td> ' + 
@@ -708,7 +645,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-LANGTAG" name="prod-LANGTAG"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-LANGTAG" name="prod-LANGTAG"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">LANGTAG</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"@" ([a-zA-Z])+ ( "-" ([a-zA-Z0-9])+ )*</code></td> ' + 
@@ -717,7 +654,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">UCHAR</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> )<br/> ' + 
@@ -727,7 +664,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">ECHAR</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"\\" [tbnrf\\\"\']</code></td> ' + 
@@ -736,7 +673,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">NIL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"(" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* ")"</code></td> ' + 
@@ -745,7 +682,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">81</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">WS</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">" "<br/> ' + 
@@ -757,7 +694,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">82</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">ANON</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">"[" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* "]"</code></td> ' + 
@@ -766,7 +703,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">83</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_CHARS_BASE</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">[A-Z]<br/> ' + 
@@ -788,7 +725,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">84</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_CHARS_U</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/> ' + 
@@ -798,7 +735,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">85</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_CHARS</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span><br/> ' + 
@@ -812,7 +749,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">86</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">PN_PREFIX</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span> ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." )* <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> )?</code></td> ' + 
@@ -821,7 +758,7 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">87</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production directive">PASSED TOKENS</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content">([ \t\r\n])+<br/> ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf	Tue Oct 16 09:35:57 2012 +0100
@@ -1,4 +1,4 @@
-[1] bundle ::= "bundle" namespaceDeclarations? expression* namedBundle* "endBundle"
+[1] document ::= "document" namespaceDeclarations? expression* bundle* "endDocument"
 
 
 
@@ -10,8 +10,7 @@
         | agentExpression |  associationExpression | attributionExpression | delegationExpression
         | derivationExpression | influenceExpression
         | alternateExpression | specializationExpression | mentionExpression | membershipExpression 
-       | extensibilityExpression
-        | insertionExpression | removalExpression | dictMembershipExpression )
+       | extensibilityExpression )
 
 
 [3] entityExpression::=	"entity" "(" identifier optionalAttributeValuePairs ")"
@@ -74,7 +73,7 @@
 [25] influenceExpression::=	"wasInfluencedBy" "("  optionalIdentifier eIdentifier "," eIdentifier optionalAttributeValuePairs ')'
 
 
-[32] namedBundle ::= "bundle" identifier namespaceDeclarations? expression* "endBundle"
+[32] bundle ::= "bundle" identifier namespaceDeclarations? expression* "endBundle"
 
 
 [26] alternateExpression::=	"alternateOf" "("  eIdentifier "," eIdentifier ")"
@@ -168,22 +167,6 @@
 
 
 
-dIdentifier ::=identifier
-
-[31c] dictMembershipExpression::=	"hadMembers" "("  optionalIdentifier  dIdentifier "," keyEntitySet complete  optionalAttributeValuePairs ")"
-
-[30] removalExpression::=	"derivedByRemovalFrom" "("  optionalIdentifier dIdentifier "," dIdentifier "," keySet optionalAttributeValuePairs ")"
-
-[28] insertionExpression::=	"derivedByInsertionFrom" "("  optionalIdentifier dIdentifier "," dIdentifier "," keyEntitySet optionalAttributeValuePairs ")"
-
-[29]keyEntitySet::= "{"  "(" literal "," identifier  ")" ( ","  "(" literal "," identifier  ")" )* "}"
-[30a] keySet::= "{" literal ("," literal)* "}"
-
-[31b] complete::= ("," ("true" | "false" | "-"))?
-
-
-
-
 
 @terminals
 QUALIFIED_NAME::= (PN_PREFIX ":")? PN_LOCAL | PN_PREFIX ":"
--- a/model/grammar/yack/prov-n-LL.bnf.html	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Tue Oct 16 09:35:57 2012 +0100
@@ -3,10 +3,10 @@
 
 <tbody class="prod">
 <tr valign="baseline">
-<td><a id="prod-prov_n_LL-bundle" name="prod-prov_n_LL-bundle"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">bundle</code></td>
+<td><a id="prod-prov_n_LL-document" name="prod-prov_n_LL-document"></a>[<span class="prodNo">1</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><code class="production prod">document</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"bundle" (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namedBundle">namedBundle</a></span>)* "endBundle"</code></td>
+<td><code class="content">"document" (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bundle">bundle</a></span>)* "endDocument"</code></td>
 </tr>
 </tbody>
 
@@ -15,7 +15,7 @@
 <td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">expression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityExpression">extensibilityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityExpression">extensibilityExpression</a></span> )</code></td>
 </tr>
 </tbody>
 
@@ -201,8 +201,8 @@
 
 <tbody class="prod">
 <tr valign="baseline">
-<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">namedBundle</code></td>
+<td><a id="prod-prov_n_LL-bundle" name="prod-prov_n_LL-bundle"></a>[<span class="prodNo">23</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><code class="production prod">bundle</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* "endBundle"</code></td>
 </tr>
@@ -482,72 +482,9 @@
 </tr>
 </tbody>
 
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">dIdentifier</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">dictMembershipExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-removalExpression" name="prod-prov_n_LL-removalExpression"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">removalExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"derivedByRemovalFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keySet">keySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-insertionExpression" name="prod-prov_n_LL-insertionExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">insertionExpression</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"derivedByInsertionFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-keyEntitySet" name="prod-prov_n_LL-keyEntitySet"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">keyEntitySet</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"{" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> ")" (( "," "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> ")" ))* "}"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-keySet" name="prod-prov_n_LL-keySet"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">keySet</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"{" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-literal">literal</a></span> ))* "}"</code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td>
-<td><code class="production prod">complete</code></td>
-<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">(( "," ( "true" | "false" | "-" ) ))?</code></td>
-</tr>
-</tbody>
-
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">QUALIFIED_NAME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">(( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":" ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_LOCAL">PN_LOCAL</a></span><br/>
@@ -557,7 +494,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_LOCAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
@@ -566,7 +503,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_OTHERS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"/"<br/>
@@ -586,7 +523,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_ESC" name="term-prov_n_LL-PN_CHARS_ESC"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_ESC" name="term-prov_n_LL-PN_CHARS_ESC"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_ESC</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"\\" ( "=" | "'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )</code></td>
@@ -595,7 +532,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">58</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PERCENT</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
@@ -604,7 +541,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">59</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">HEX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[0-9]<br/>
@@ -615,7 +552,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">60</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
@@ -625,7 +562,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">61</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PREFX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
@@ -634,7 +571,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">62</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
@@ -643,7 +580,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
@@ -652,7 +589,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">DIGIT</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[0-9]</code></td>
@@ -661,7 +598,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">DATETIME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
@@ -670,7 +607,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">66</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">TIMEZONEOFFSET</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
@@ -679,7 +616,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">67</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">IRI_REF</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"&lt;" (( [^&lt;&gt;\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* "&gt;"</code></td>
@@ -688,7 +625,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">68</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL2</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -697,7 +634,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">STRING_LITERAL_LONG2</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -706,7 +643,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">70</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">LANGTAG</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"@" ([a-zA-Z])+ (( "-" ([a-zA-Z0-9])+ ))*</code></td>
@@ -715,7 +652,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">71</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">UCHAR</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -725,7 +662,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">72</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">ECHAR</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -734,7 +671,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">73</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">NIL</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -743,7 +680,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">81</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">74</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">WS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">" "<br/>
@@ -755,7 +692,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">82</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">75</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">ANON</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -764,7 +701,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">83</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_BASE</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">[A-Z]<br/>
@@ -786,7 +723,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">84</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">77</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS_U</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -796,7 +733,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">85</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">78</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_CHARS</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -810,7 +747,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">86</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">79</span>]&nbsp;&nbsp;&nbsp;</td>
 <td>&lt;<code class="production term">PN_PREFIX</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -819,7 +756,7 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">87</span>]&nbsp;&nbsp;&nbsp;</td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">80</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production directive">PASSED TOKENS</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content">([ \t\r\n])+<br/>
--- a/model/prov-n.html	Mon Oct 15 22:21:35 2012 +0100
+++ b/model/prov-n.html	Tue Oct 16 09:35:57 2012 +0100
@@ -408,7 +408,7 @@
 <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 
-<code><a class="grammarRef" href="#prod-bundle">bundle</a></code>.</li>
+<code><a class="grammarRef" href="#prod-document">document</a></code>.</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  <code><a class="grammarRef" href="#prod-expression">expression</a></code> nonterminal a useful entry point into the grammar.</li>
 </ul>
 
@@ -423,7 +423,7 @@
 
 <p><a href="#prov-n-expressions">Section 3</a> presents the grammar of all expressions of the language grouped according to the PROV data model components.</p>
 
-<p><a href="#toplevelBundle">Section 4</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="#document">Section 4</a> defines the grammar of document, a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
 
 <p><a href="#extensibility">Section 5</a> defines the extensibility mechanism for the PROV-N notation.</p>
 
@@ -612,7 +612,7 @@
 <p>Each of the symbols included in <code>expression</code> above, i.e., <code><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></code>,  <code><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></code> etc., corresponds to one concept (e.g., Entity, Activity, etc.) of the PROV data model.</p>
 
 
-<p>Alternatively,  the production rule <code><a href="#prod-bundle"><span class="grammarRef">bundle</span></a></code>
+<p>Alternatively,  the production rule <code><a href="#prod-document"><span class="grammarRef">document</span></a></code>
 provides the overall structure of PROV-N descriptions.  It is a wrapper  for
  a set of expressions, such that the text for an element matches the corresponding <code><a class="grammarRef" href="#prod-expression">expression</a></code> production,  and some namespace declarations.</p>
 
@@ -1790,12 +1790,12 @@
 <h4>Bundle Constructor</h4>
 
 <table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
+<tbody class="grammar-ref" data-ref="prod-bundle"></tbody>
 </table>
 
-<p>Named bundles cannot be nested because <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> is not an <code><a class="grammarRef" href="#prod-expression">expression</a></code>, and therefore cannot occurs inside another <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code>.</p>
-
-<p>Named bundles are self-contained: each identifier occuring in a named bundle, including the bundle identifier itself, MUST be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a named bundle, there MUST be a namespace declaration for <code>p</code> in this named bundled; for every identifier  without prefix, there MUST be a default namespace declaration  in this named bundled.</p>
+<p>Bundles cannot be nested because <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> is not an <code><a class="grammarRef" href="#prod-expression">expression</a></code>, and therefore cannot occurs inside another <code><a class="grammarRef" href="#prod-bundle">bundle</a></code>.</p>
+
+<p>Bundles are self-contained: each identifier occuring in a bundle, including the bundle identifier itself, MUST be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a bundle, there MUST be a namespace declaration for <code>p</code> in this bundled; for every identifier  without prefix, there MUST be a default namespace declaration  in this bundle.</p>
 
 <div class="anexample">
     <pre class="codeexample">
@@ -2207,7 +2207,7 @@
 <div class="anexample" id="anexample-qualified-name">
 <p>Examples of articles on the BBC Web site seen as  entities.</p>
 <pre class="codeexample">
-bundle
+document
   prefix bbc &lt;http://www.bbc.co.uk/&gt;
   prefix bbcNews &lt;http://www.bbc.co.uk/news/&gt;
 
@@ -2217,7 +2217,7 @@
 
   entity(bbcNews:)                      // an alternative way of referring to the bbc news site
 
-endBundle
+endDocument
 </pre>
 </div>
 
@@ -2225,7 +2225,7 @@
 <div class="anexample" id="anexample-qualified-name2">
 <p>Examples of entities with declared and default namespace.</p>
 <pre class="codeexample">
-bundle
+document
   default &lt;http://example.org/2/&gt;
   prefix ex &lt;http://example.org/1/&gt;
 
@@ -2237,7 +2237,7 @@
   entity(4567)     //  corresponds to IRI http://example.org/2/4567
   entity(c/)       //  corresponds to IRI http://example.org/2/c/
   entity(ex:/)     //  corresponds to IRI http://example.org/1//
-endBundle
+endDocument
 </pre>
 </div>
 
@@ -2245,7 +2245,7 @@
 <div class="anexample" id="anexample-qualified-name3">
 <p>Examples of \-escaped characters.</p>
 <pre class="codeexample">
-bundle
+document
   prefix ex &lt;http://example.org/&gt;
   default &lt;http://example.org/default&gt;
 
@@ -2255,7 +2255,7 @@
 
   used(-;a1,e1,-)                // identifier not specified for usage  
   used(\-;a1,e1,-)               // usage identifier corresponds to http://example.org/default-
-endBundle
+endDocument
 </pre>
 </div>
 
@@ -2473,9 +2473,9 @@
 A <code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></code> consists of a namespace. Every qualified name without prefix in the scope of this declaration belongs to this namespace. Scope of a declaration is specified as follows:</p>
 <ul>
 <li> 
-The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> is the <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> itself;</li>
+The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> is the <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> itself;</li>
 <li>
-the scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-bundle">toplevel bundle</a></code> is the <code><a class="grammarRef" href="#prod-bundle">toplevel bundle</a></code> itself, except and <code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code> it may contain.</li>
+the scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-document">document</a></code> is the <code><a class="grammarRef" href="#prod-document">document</a></code> itself, except the <code><a class="grammarRef" href="#prod-bundle">bundles</a></code> it may contain.</li>
 </ul>
 
 <p>A set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code> MUST NOT re-declare the same prefix.</p>
@@ -2487,24 +2487,24 @@
 <div class="anexample" id="anexample-namespace">
 <p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
 <pre class="codeexample">
-bundle
+document
   default &lt;http://example.org/0/&gt;
   prefix ex1 &lt;http://example.org/1/&gt;
   prefix ex2 &lt;http://example.org/2/&gt;
 ...
-endBundle
+endDocument
 </pre>
 </div>
 
 
 <div class="anexample" id="anexample-namespace-scope">
-<p>In the following example, a toplevel bundle declares a default namespace and the occurrence of
-<code>e001</code> directly occurring in the toplevel bundle refers to that namespace.
-A nested named bundle also declares a default namespace, but with a different IRI.
-In that named bundle, the occurrences of
+<p>In the following example, a document declares a default namespace and the occurrence of
+<code>e001</code> directly occurring in the document refers to that namespace.
+A nested bundle also declares a default namespace, but with a different IRI.
+In that  bundle, the occurrences of
 <code>e001</code>, including for the bundle name, refer to the latest default namespace.</p>
 <pre class="codeexample">
-bundle
+document
   default &lt;http://example.org/1/&gt;
   entity(e001)                             // IRI: http://example.org/1/e001
 
@@ -2512,7 +2512,7 @@
     default &lt;http://example.org/2/&gt;
     entity(e001)                           // IRI: http://example.org/2/e001
   endBundle
-endBundle
+endDocument
 </pre>
 </div>
 
@@ -2583,48 +2583,48 @@
 
 
 
-<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
+<section id="document">
+<h4>Document</h4>
+
+<p>A <dfn>document</dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations.  A document forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them.  A document 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,  a toplevel bundle is not defined as a PROV-N expression (production <code class="content"><a class="grammarRef" href="#prod-expression">expression</a></code>).</p> 
-
-
-
-
-
-<p>A toplevel bundle's text matches the <code class="content"><a class="grammarRef"
- href="#prod-bundle">bundle</a></code> production.</p>
+<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions,  a document is not defined as a PROV-N expression (production <code class="content"><a class="grammarRef" href="#prod-expression">expression</a></code>).</p> 
+
+
+
+
+
+<p>A document's text matches the <code class="content"><a class="grammarRef"
+ href="#prod-document">document</a></code> production.</p>
 
 <table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-bundle"></tbody>
+<tbody class="grammar-ref" data-ref="prod-document"></tbody>
 </table>
 
-<p>A toplevel bundle contains:
+<p>A document contains:
 <ul>
 <li><em>namespaceDeclarations</em>: a set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code>, 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 set of expressions matching <code><a class="grammarRef" href="#prod-expression">expression</a></code>;</li>
-<li><em>namedBundles</em>:  a  set of
-<code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a></code>.</li>
+<li><em>bundles</em>:  a  set of
+<code><a class="grammarRef" href="#prod-bundle">bundle</a></code>.</li>
 </ul>
 
 
-<p>Thus, named bundles can occur inside a toplevel bundle. 
-Named bundles are self-contained: each identifier occuring in a named bundle, including the named bundle's identifier itself, MUST be interpreted with respect to the namespace declarations of that named bundle. In other words, named bundles SHOULD not inherit namespaces declarations from the toplevel bundle.
+<p>Thus, bundles can occur inside a document. 
+Bundles are self-contained: each identifier occuring in a bundle, including the bundle's identifier itself, MUST be interpreted with respect to the namespace declarations of that  bundle. In other words,  bundles SHOULD not inherit namespaces declarations from the document.
 </p>
 
 
 
 <div class="anexample">
 <p>
-The following bundle contains expressions related to the provenance of entity 
+The following document contains expressions related to the provenance of entity 
 <span class="name">e2</span>.
 </p>
 <pre class="codeexample">
-bundle
+document
   default &lt;http://anotherexample.org/&gt;
   prefix ex &lt;http://example.org/&gt;
 
@@ -2635,7 +2635,7 @@
   wasAssociatedWith(a1, ag2, -, [prov:role="author"])
   agent(ag2, [ prov:type='prov:Person', ex:name="Bob" ])
 
-endBundle
+endDocument
 </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>
@@ -2701,96 +2701,6 @@
 
 </section>
 
-<!--
-<section  id="account">
-<h3>Account</h3>
-
-<p>The PROV data model has introduced a notion of account by which a set of provenance descriptions can be bundled up and named.  The PROV data model <em>assumes</em> the existence of mechanisms to implement accounts, but such mechanisms remain outside its scope.  It is suggested that specific serializations may offer solutions to name bundles of descriptions. </p>
-
-<p>Given that the primary motivation for PROV-N is to provide a notation aimed at human consumption, it is therefore appropriate to introduce a notation for accounts, which would include an account name and a bundle of expressions.</p>
-
-
-
-<p>An account, written <span class="name">account(id, exprs)</span> in PROV-N, contains:</p>
-<ul>
-<li><em>id</em>: an identifier  that identifies this account;</li>
-<li><em>expressions</em>: a set <span class="name">exprs</span> of expressions;</li>
-</ul>
-
-<p>In PROV-N, an account's text matches the <span class="nonterminal">accountExpression</span> production of the grammar.</p>
-
-<div class='grammar'>
-<span class="nonterminal">accountExpression</span>&nbsp;::=  
-<span class="name">account</span> 
-<span class="name">(</span> 
-<span class="nonterminal">identifier</span> 
-<span class="name">,</span> 
-<span class="plus">
-<span class="nonterminal">expression</span> </span>
-<span class="name">)</span> 
-</div>
-
-<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> ::=  
-<span class="name">container</span> 
-<span class="nonterminal">namespaceDeclarations</span> 
-<span class="plus"> <span class="nonterminal">expression</span> </span>
-<span class="name">endContainer</span>   <br/>
-| <span class="name">container</span> 
-<span class="nonterminal">namespaceDeclarations</span> 
-<span class="plus"> <span class="nonterminal">accountExpression</span> </span>
-<span class="name">endContainer</span>  
-</div>
-
-
-
-<div class="anexample">
-<p>
-The following container </p>
-<pre class="codeexample">
-container
-  prefix ex &lt;http://example.org/&gt;
-
-  account(ex:acc1,...)
-  account(ex:acc2,...)
-endContainer
-</pre>
-<p> illustrates how two accounts with identifiers <span class="name">ex:acc1</span> and <span class="name">ex:acc2</span> can be returned in a PROV-N serialization of the provenance of
-something.
-</p>
-</div>
-
-
-<div class="anexample">
-<p>
-The following container </p>
-<pre class="codeexample">
-container
-  prefix ex &lt;http://example.org/&gt;
-  ...
-
-  account(ex:acc1,
-      entity(tr:WD-prov-dm-20111018, [ prov:type="pr:RecsWD" %% xsd:QName ])
-      entity(tr:WD-prov-dm-20111215, [ prov:type="pr:RecsWD" %% xsd:QName ])
-      ...
-      wasAssociatedWith(ex:pub2, w3:Consortium, pr:rec-advance))
-
-  account(ex:acc2,
-      entity(ex:acc1, [prov:type="prov:Account" %% xsd:QName ])
-      wasAttributedTo(ex1:acc1, w3:Consortium))
-
-endContainer
-</pre>
-<p> illustrates a first account, with identifier <span class="name">ex:acc1</span>, containing expressions describing the provenance  of the technical report <span class="name">tr:WD-prov-dm-20111215</span>, and a second account <span class="name">ex:acc2</span>, describing the provenance of the first.  In account <span class="name">ex:acc2</span>, <span class="name">ex:acc1</span> is the identifier of an entity of type <span class="name">prov:Account</span>.
-</p>
-</div>
-
-
-</section>
-
--->
 
 <section  id="media-type">
 <h3>Media Type</h3>
@@ -2855,7 +2765,7 @@
       <dd>No widely deployed applications are known to use this media type. It may be used by some web services and clients consuming their data.</dd> 
       <dt>Additional information:</dt> 
       <dt>Magic number(s):</dt> 
-      <dd>PROV-N documents may have the strings 'bundle' near the beginning of the document.</dd> 
+      <dd>PROV-N documents may have the strings 'document' near the beginning of the document.</dd> 
       <dt>File extension(s):</dt> 
       <dd>".provn"</dd> 
       <dt>Base URI:</dt>