Mercurial > hg > prov / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
renamed QUALNAME non-terminal
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Wed, 16 May 2012 09:23:56 +0100
changeset 2846 d6d340271094
parent 2843 2b4ae482ab23
child 2847 f7cd9faaace9
renamed QUALNAME non-terminal
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	Wed May 16 09:18:04 2012 +0100
+++ b/model/diff-n.html	Wed May 16 09:23:56 2012 +0100
@@ -997,14 +997,25 @@
 
 
 
-<h4 id="first-public-working-draft">First Public Working Draft</h4>
- <p>This is the first public release of the PROV-N
+<span class="delete">First Public Working Draft</span>
+ 
+
+
+
+
+
+
+
+
+
+
+<p>This <span class="delete">is the first public release of the PROV-N
 document. Following feedback, the Working Group has decided to
 reorganize the PROV-DM document substantially, separating the data model,
 from its constraints, and the notation used to illustrate it. The
 PROV-N release is synchronized with the release of the PROV-DM, PROV-O,
 PROV-PRIMER, and PROV-CONSTRAINTS documents.
-</p><p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public 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-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). 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.</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="#prov-dm-namespace" 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="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</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-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication</a></li><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.5.1 </span>Insertion</a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.5.2 </span>Removal</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.5.3 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></a><ul class="toc"><li class="tocline"><a href="#expression-note" class="tocxref"><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</a></li><li class="tocline"><a href="#expression-annotation" class="tocxref"><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</a></li></ul></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span><span class="delete">Expression Container</span><span class="delete">5. </span><span class="delete">Account</span><span class="insert">Toplevel Bundle</span></a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno"><span class="delete">6.</span><span class="insert">5.</span> </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> 
+</span><span class="delete">This </span>document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public 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-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). 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.</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="#prov-dm-namespace" 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="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</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-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication</a></li><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: <span class="delete">Collections</span><span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno">3.5.2 </span><span class="delete">Removal</span><span class="delete">3.5.3 </span><span class="delete">Membership</span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="delete">Annotations</span><span class="insert">Collections</span></a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.6.1 </span><span class="delete">Note</span><span class="insert">Insertion</span></a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.6.2 </span><span class="delete">Annotation</span><span class="insert">Removal</span></a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Membership</span></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-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.1 </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.2 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.3 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.4 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.4.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.4.2 </span>Time Values</a></li></ul></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span><span class="delete">Expression Container</span><span class="delete">5. </span><span class="delete">Account</span><span class="insert">Toplevel Bundle</span></a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno"><span class="delete">6.</span><span class="insert">5.</span> </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> 
 
 
 
@@ -2325,18 +2336,15 @@
 </div>
 
 <div id="component5" class="section"> 
-<h3><span class="secno">3.5 </span>Component 5: Collections</h3>
-
-<span class="delete">Grammar for collections </span><span class="delete">may</span><span class="delete"> under go minor syntactic changes since it has not been implemented yet.</span>
-
-
-
-
-In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
-
-
-<span class="delete">keyValuePairs</span><span class="delete"> &nbsp;::= 
-</span><span class="delete">(</span>
+<h3><span class="secno">3.5 </span>Component 5: <span class="delete">Collections</span><span class="insert">Bundles</span></h3>
+
+<span class="delete">Grammar for collections </span><span class="delete">may</span><span class="delete"> under go minor syntactic changes since it has not been implemented yet.</span><span class="delete">
+
+In the productions in this section, nonterminals </span><span class="delete">keyValuePairs</span><span class="delete"> and </span><span class="delete">keySet</span><span class="delete"> are defined as follows.
+
+</span>
+<span class="delete">keyValuePairs</span><span class="delete"> &nbsp;::=</span><div id="expression-bundle-declaration" class="section"> 
+<span class="delete">(</span>
     <span class="delete">literal</span>
  <span class="delete">,</span>
 <span class="delete">eidentifier</span>
@@ -2362,23 +2370,14 @@
 
 
 
-
-
-
-<div id="expression-collection-insertion" class="section">
-<h4><span class="secno">3.5.1 </span>Insertion</h4>
+<h4><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Bundle Declaration</span></h4>
 
 
  <span class="delete">derivationByInsertionFromExpression</span><span class="delete">&nbsp;::=  
 </span><span class="delete">derivedByInsertionFrom</span> 
- 
-
-
-
-<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-insertionExpression" name="prod-insertionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">28</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">29</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"{" "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" </span>(
- <span class="insert"> "," "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier
+ <table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namedBundle</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"bundle" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span> (
+ <span class="delete">identifier</span>
  <span class="delete">,</span>
 <span class="delete">cIdentifier</span>
  <span class="delete">,</span>
@@ -2389,11 +2388,75 @@
    <span class="delete">}</span>
 <span class="delete">optional-attribute-values</span>
   <span class="delete">)</span>
-</a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody>
+<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody>
 </table>
 
 <div class="anexample">
-    <pre class="codeexample"> <span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c1, c, {("k1", v1), ("k2", v2)}, [])  
+    <pre class="codeexample"><span class="delete"> derivedByInsertionFrom(id,</span><span class="insert">bundle ex:author-view
+  agent(ex:Paolo,   [ prov:type='prov:Person' ])
+  agent(ex:Simon,   [ prov:type='prov:Person' ])
+  ...
+endBundle
+  </span></pre>
+<p><span class="insert"> Here  </span><span class="name"><span class="insert">ex:author-view</span></span><span class="insert"> is the name of the bundle.
+</span></p></div>
+
+</div>
+
+
+<div id="expression-provenance-locator" class="section"> 
+<h4><span class="secno"><span class="insert">3.5.2 </span></span><span class="insert">Provenance Locator</span></h4>
+
+
+<table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-provenanceLocatorExpression" name="prod-provenanceLocatorExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">provenanceLocatorExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"hasProvenanceIn" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-iriOrMarker" name="prod-iriOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">iriOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+</table>
+
+
+<div class="anexample">
+    <pre class="codeexample"><span class="insert">
+bundle bob:bundle4
+  entity(ex:report1, ...)
+endBundle
+
+bundle alice:bundle5
+  entity(ex:report1)
+  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)   
+  entity(ex:report2, ...)
+  wasDerivedFrom(ex:report2, ex:report1)
+endBundle
+</span></pre><span class="insert">
+
+In bundle </span><span class="name"><span class="insert">alice:bundle5</span></span><span class="insert">, there is a description for entity </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert">, and a provenance locator pointing to bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">. 
+The locator indicates that some provenance description for </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">. 
+</span></div>
+
+</div>
+</div>
+
+
+
+<div id="component6" class="section"> 
+<h3><span class="secno"><span class="insert">3.6 </span></span><span class="insert">Component 6: Collections</span></h3><span class="insert">
+
+
+In the productions in this section, nonterminals </span><span class="nonterminal"><span class="insert">keyValuePairs</span></span><span class="insert"> and </span><span class="nonterminal"><span class="insert">keySet</span></span><span class="insert"> are defined as follows.
+
+
+
+</span><div id="expression-collection-insertion" class="section">
+<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Insertion</span></h4>
+
+
+
+<table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-insertionExpression" name="prod-insertionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">28</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">29</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"{" "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" ( "," "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody>
+</table>
+
+<div class="anexample">
+    <pre class="codeexample"><span class="insert"> derivedByInsertionFrom(id;</span> c1, c, {("k1", v1), ("k2", v2)}, [])  
   </pre>
 <p>  Here
     <span class="name">id</span> is the optional insertion identifier,
@@ -2414,7 +2477,7 @@
 </div>
 
 <div id="expression-collection-removal" class="section">
-<h4><span class="secno">3.5.2 </span>Removal</h4>
+<h4><span class="secno"><span class="delete">3.5.2</span><span class="insert">3.6.2</span> </span>Removal</h4>
 
 
  <span class="delete">derivationByRemovalFromExpression</span><span class="delete">&nbsp;::=  
@@ -2464,7 +2527,7 @@
 </div>
 
 <div id="expression-collection-membership" class="section">
-<h4><span class="secno">3.5.3 </span>Membership</h4>
+<h4><span class="secno"><span class="delete">3.5.3</span><span class="insert">3.6.3</span> </span>Membership</h4>
 
 
  
@@ -2511,135 +2574,81 @@
 
 
 </div>   
+ 
+<span class="delete">3.6 </span><span class="delete">Component 6: Annotations</span>
+    
+<span class="delete">3.6.1 </span><span class="delete">Note</span>
+
+
+<span class="delete">noteExpression</span><span class="delete">&nbsp;::= 
+</span><span class="delete">note</span>
+<span class="delete">(</span>
+<span class="delete">identifier</span>
+<span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
+
+
+
+
+<span class="delete">note(ann1,[ex:color="blue", ex:screenX=20, ex:screenY=30])
+</span>
+
+
+    
+
+
+<span class="delete">3.6.2 </span><span class="delete">Annotation</span>
+
+
+<span class="delete">annotationExpression</span><span class="delete">&nbsp;::=  
+</span><span class="delete">hasAnnotation</span>
+<span class="delete">(</span>
+<span class="delete">identifier</span>
+<span class="delete">,</span>
+<span class="delete">nIdentifier</span>
+<span class="delete">)</span>
+
+
+
+
+<span class="delete">hasAnnotation(tr:WD-prov-dm-20111215,ex2:n1)
+</span><span class="delete">
+  Here
+   </span><span class="delete">ex2:n1</span><span class="delete"> is the  identifier for a note of the entity identified by 
+  </span><span class="delete">(tr:WD-prov-dm-20111215</span><span class="delete">.
+</span>
+
+
+
+
+
+
+
+
+
+
    
 
-<div id="component6" class="section"> 
-<h3><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></h3>
-
-<div id="expression-bundle-declaration" class="section"> 
-<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></h4>
-
-<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namedBundle</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"bundle" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody>
-</table>
-
-<div class="anexample">
-    <pre class="codeexample"><span class="insert">bundle ex:author-view
-  agent(ex:Paolo,   [ prov:type='prov:Person' ])
-  agent(ex:Simon,   [ prov:type='prov:Person' ])
-  ...
-endBundle
-  </span></pre>
-<p><span class="insert"> Here  </span><span class="name"><span class="insert">ex:author-view</span></span><span class="insert"> is the name of the bundle.
-</span></p></div>
-
-</div>
-
-
-<div id="expression-provenance-locator" class="section"> 
-<h4><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Provenance Locator</span></h4>
-
-
-<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-provenanceLocatorExpression" name="prod-provenanceLocatorExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">provenanceLocatorExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"hasProvenanceIn" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-iriOrMarker" name="prod-iriOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">iriOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
-</table>
-
-
-<div class="anexample">
-    <pre class="codeexample"><span class="insert">
-bundle bob:bundle4
-  entity(ex:report1, ...)
-endBundle
-
-bundle alice:bundle5
-  entity(ex:report1)
-  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)   
-  entity(ex:report2, ...)
-  wasDerivedFrom(ex:report2, ex:report1)
-endBundle
-</span></pre><span class="insert">
-
-In bundle </span><span class="name"><span class="insert">alice:bundle5</span></span><span class="insert">, there is a description for entity </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert">, and a provenance locator pointing to bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">. 
-The locator indicates that some provenance description for </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">. 
-</span></div>
-
-</div>
-</div>
-
-
-
-
-
-
-<div id="component6" class="section"> 
-<h3><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></h3>
-   <div id="expression-note" class="section"> 
-<h4><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</h4>
-
-<div class="grammar">
-<span class="nonterminal">noteExpression</span>&nbsp;::= 
-<span class="name">note</span>
-<span class="name">(</span>
-<span class="nonterminal">identifier</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
-
-
-<div class="anexample">
-<pre class="codeexample"><span class="delete">note(ann1,[ex:color="blue",</span><span class="insert">note(ann1; [ex:color="blue",</span> ex:screenX=20, ex:screenY=30])
-</pre>
-</div>
-
-   </div> 
-
-<div id="expression-annotation" class="section">
-<h4><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</h4>
-
-<div class="grammar">
-<span class="nonterminal">annotationExpression</span>&nbsp;::=  
-<span class="name">hasAnnotation</span>
-<span class="name">(</span>
-<span class="nonterminal">identifier</span>
-<span class="name">,</span>
-<span class="nonterminal">nIdentifier</span>
-<span class="name">)</span>
-</div>
-
-
-<div class="anexample">
-<pre class="codeexample">hasAnnotation(tr:WD-prov-dm-20111215,ex2:n1)
-</pre>
-  Here
-   <span class="name">ex2:n1</span> is the  identifier for a note of the entity identified by 
-  <span class="name">(tr:WD-prov-dm-20111215</span>.
-</div>
-
-
-</div>
-
-
-
-</div>
+
+
 
 
 
 <div id="subexpressions" class="section">
-<h3><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</h3>
+<h3><span class="secno">3.7 </span>Further Expressions</h3>
 
 This section defines further expressions of PROV-N.
 
 
 <div id="expression-NamespaceDeclaration" class="section">
-<h4><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</h4>
+<h4><span class="secno">3.7.1 </span>Namespace Declaration</h4>
 
 
 
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">53</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">55</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody>
 <tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"&lt;" ( [^&lt;&gt;"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* "&gt;"</span></code></td> </tr> </tbody>
 
@@ -2680,7 +2689,7 @@
 
 
 <div id="expression-identifier" class="section">
-<h4><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</h4>
+<h4><span class="secno">3.7.2 </span>Identifier</h4>
 
 <p>
 A <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
@@ -2700,7 +2709,7 @@
 
 
 
-<p><span class="insert">A PROV qualified name </span><a class="grammarRef" href="#term-prov_n_LL-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> has</span> a <span class="delete">generation)</span>
+<p><span class="insert">A PROV qualified name </span><a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a><span class="insert"> has</span> a <span class="delete">generation)</span>
 <span class="delete">uIdentifier</span><span class="delete">::=  </span><span class="delete">identifier</span> <span class="delete">(intended to denote a usage)</span>
 <span class="delete">nIdentifier</span><span class="delete">::=  </span><span class="delete">identifier</span> <span class="delete">(intended to denote a note)</span>
 <span class="delete">cIdentifier</span><span class="delete">::=  </span><span class="delete">identifier</span> <span class="delete">(intended to denote a collection)</span>
@@ -2731,7 +2740,7 @@
 
 
 
-<p><span class="insert">Qualified names </span><a class="grammarRef" href="#term-prov_n_LL-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> consist of a prefix and a local part. Prefixes follow the production </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX"><span class="insert">PN_PREFIX</span></a><span class="insert"> defined by SPARQL [</span><cite><a class="bibref" rel="biblioentry" href="#bib-RDF-SPARQL-QUERY"><span class="insert">RDF-SPARQL-QUERY</span></a></cite><span class="insert">]. Local parts have to be conformant with </span><a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert">, which extends the original SPARQL </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert"> definition by allowing further characters and %-escaped charaters (see </span><a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a><span class="insert">).</span></p>
+<p><span class="insert">Qualified names </span><a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a><span class="insert"> consist of a prefix and a local part. Prefixes follow the production </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX"><span class="insert">PN_PREFIX</span></a><span class="insert"> defined by SPARQL [</span><cite><a class="bibref" rel="biblioentry" href="#bib-RDF-SPARQL-QUERY"><span class="insert">RDF-SPARQL-QUERY</span></a></cite><span class="insert">]. Local parts have to be conformant with </span><a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert">, which extends the original SPARQL </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert"> definition by allowing further characters and %-escaped charaters (see </span><a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a><span class="insert">).</span></p>
 
  
 <table class="grammar">
@@ -2747,9 +2756,9 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
-
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
+
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALIFIED_NAME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
 <tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</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="insert">[</span><span class="prodNo"><span class="insert">76</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT"><span class="insert">PERCENT</span></a></span><br><span class="insert"> | "/"</span><br><span class="insert"> | "@"</span><br><span class="insert"> | "~"</span><br><span class="insert"> | "&amp;"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody>
 <tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">77</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody>
@@ -2807,7 +2816,7 @@
 </div>
 
 <div id="expression-attribute" class="section">
-<h4><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</h4>
+<h4><span class="secno">3.7.3 </span>Attribute</h4>
 
 
 
@@ -2818,7 +2827,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">attribute<span class="delete">&nbsp;::=  </span><span class="delete">qualifiedName</span>
 
 
-</code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
+</code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
 </table>
 
 
@@ -2840,7 +2849,7 @@
 
 
 <div id="expression-literal" class="section">
-<h4><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</h4>
+<h4><span class="secno">3.7.4 </span>Literal</h4>
 
 
 <span class="delete">Literal</span><span class="delete"> &nbsp;::= </span>
@@ -2852,8 +2861,8 @@
 </a></span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-typedLiteral" name="prod-typedLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">typedLiteral<span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</span> </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype">datatype
 </a></span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">datatype<span class="delete"> ::= </span><span class="delete">qualifiedName</span> </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
-<tbody><tr valign="baseline"><td></td><td><em><span class="insert">where </span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> is</span> listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tr></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">datatype<span class="delete"> ::= </span><span class="delete">qualifiedName</span> </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
+<tbody><tr valign="baseline"><td></td><td><em><span class="insert">where </span><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a><span class="insert"> is</span> listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tr></tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">convenienceNotation</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><br>
 <span class="delete">convenienceNotation</span><span class="delete"> &nbsp;::= </span><span class="delete">stringLiteral</span> | <span class="delete">intLiteral</span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br>
 <span class="delete">stringLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span>
@@ -2862,12 +2871,12 @@
 <span class="delete">intLiteral</span><span class="delete"> ::= </span><span class="delete">a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</span>
 
 
-<span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody>
+<span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></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="insert">[</span><span class="prodNo"><span class="insert">63</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
 
 ] ) | </span><span class="prod"><a class="grammarRef" href="#prod-ECHAR"><span class="insert">ECHAR</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* '"'</span></code></td> </tr> </tbody>
 <tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">64</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">INT_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">65</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></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="insert">[</span><span class="prodNo"><span class="insert">65</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALIFIED_NAME_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
 </table>
 
 
@@ -2876,11 +2885,11 @@
 <p>The non terminals <span class="delete">stringLiteral</span>
 <a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a><span class="insert">,
 </span><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a><span class="insert">,</span> and
-<span class="delete">intLiteral</span><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a>
+<span class="delete">intLiteral</span><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a>
 are syntactic sugar for quoted strings with datatype  
 <a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a><span class="delete"> and </span><span class="insert">,
 </span><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, <span class="insert">and
-</span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a>
+</span><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a>
 respectively.
 </p>
 
@@ -2890,7 +2899,7 @@
 <caption id="permitted-datatypes">Permitted datatypes in literals</caption>
 <tbody><tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td>  <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td>  <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral"><span class="insert">rdf:XMLLiteral</span></a></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><span class="delete">rdf:XMLLiteral</span><a href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><span class="delete">rdf:XMLLiteral</span><a href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
@@ -2904,7 +2913,7 @@
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:QName</a></td><td></td></tr>
 </tbody></table>
 
-<p><b>Note:</b>The productions for <span class="delete">qualifiedName</span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a> and <span class="delete">intLiteral</span>
+<p><b>Note:</b>The productions for <span class="delete">qualifiedName</span><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a> and <span class="delete">intLiteral</span>
 <a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a> are conflicting.  In the context of a <span class="delete">Literal</span> 
 <a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a>, a parser should give precedence to the production for <span class="delete">intLiteral</span>
 <a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a>.
@@ -2930,7 +2939,7 @@
 
 
 <div id="expression-types" class="section">
-<h5><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</h5>
+<h5><span class="secno">3.7.4.1 </span>Reserved Type Values</h5>
 
 <p>The  reserved type values in the PROV namespace are the following.</p>
 
@@ -2957,7 +2966,7 @@
 </div>
 
 <div id="expression-Time" class="section">
-<h5><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</h5>
+<h5><span class="secno">3.7.4.2 </span>Time Values</h5>
 
 <p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [<cite><a class="bibref" rel="biblioentry" href="#bib-XMLSCHEMA-2">XMLSCHEMA-2</a></cite>].</p> 
 
--- a/model/grammar/ll.html	Wed May 16 09:18:04 2012 +0100
+++ b/model/grammar/ll.html	Wed May 16 09:23:56 2012 +0100
@@ -412,7 +412,7 @@
 <td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">46</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">identifier</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-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -421,7 +421,7 @@
 <td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">47</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">attribute</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-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -458,7 +458,7 @@
 <td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">51</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-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -469,7 +469,7 @@
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span><br/>
 | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INT_LITERAL">INT_LITERAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></span></code></td>
 </tr>
 </tbody>
 
@@ -487,7 +487,7 @@
 <td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">namespaceDeclaration</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
+<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
 </tr>
 </tbody>
 
@@ -511,8 +511,8 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">QUALNAME</code>&gt;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">57</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/>
 | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":"</code></td>
@@ -584,10 +584,10 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">QUALNAME_LITERAL</code>&gt;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">65</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-QUALNAME">QUALNAME</a></span> "'"</code></td>
+<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/ll.js	Wed May 16 09:18:04 2012 +0100
+++ b/model/grammar/ll.js	Wed May 16 09:23:56 2012 +0100
@@ -413,7 +413,7 @@
 '<td><a id="prod-identifier" name="prod-identifier"></a>[<span class="prodNo">46</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">identifier</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span></code></td> ' + 
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -422,7 +422,7 @@
 '<td><a id="prod-attribute" name="prod-attribute"></a>[<span class="prodNo">47</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">attribute</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span></code></td> ' + 
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -459,7 +459,7 @@
 '<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">51</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-QUALNAME">QUALNAME</a></span></code></td> ' + 
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -470,7 +470,7 @@
 '<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><br/> ' + 
 '| <span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></span><br/> ' + 
-'| <span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td> ' + 
+'| <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -488,7 +488,7 @@
 '<td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">namespaceDeclaration</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> ' + 
+'<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -512,8 +512,8 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-QUALNAME" name="prod-QUALNAME"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td>&lt;<code class="production term">QUALNAME</code>&gt;</td> ' + 
+'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">57</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-PN_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="#prod-PN_PREFIX">PN_PREFIX</a></span> ":"</code></td> ' + 
@@ -585,10 +585,10 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td>&lt;<code class="production term">QUALNAME_LITERAL</code>&gt;</td> ' + 
+'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">65</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-QUALNAME">QUALNAME</a></span> "\'"</code></td> ' + 
+'<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "\'"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Wed May 16 09:18:04 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf	Wed May 16 09:23:56 2012 +0100
@@ -119,9 +119,9 @@
 gIdentifierOrMarker::=(gIdentifier | "-")
 uIdentifierOrMarker::=(uIdentifier | "-")
 
-identifier ::=QUALNAME
+identifier ::=QUALIFIED_NAME
 
-attribute ::=QUALNAME
+attribute ::=QUALIFIED_NAME
 
 
 
@@ -143,10 +143,10 @@
 
 [13] literal ::=  typedLiteral | convenienceNotation
 typedLiteral ::= STRING_LITERAL "%%" datatype
-datatype::= QUALNAME
+datatype::= QUALIFIED_NAME
 
 
-convenienceNotation ::= STRING_LITERAL | INT_LITERAL | QUALNAME_LITERAL
+convenienceNotation ::= STRING_LITERAL | INT_LITERAL | QUALIFIED_NAME_LITERAL
 
 
 
@@ -157,14 +157,14 @@
 
 
 [4] namespaceDeclarations ::=  (defaultNamespaceDeclaration | namespaceDeclaration) namespaceDeclaration*
-[5] namespaceDeclaration ::= "prefix" QUALNAME namespace
+[5] namespaceDeclaration ::= "prefix" QUALIFIED_NAME namespace
 [7] defaultNamespaceDeclaration ::=     "default" IRI_REF
 [6] namespace ::= IRI_REF
 
 
 
 @terminals
-QUALNAME::= (PN_PREFIX ":")? PN_LOCAL | PN_PREFIX ":"
+QUALIFIED_NAME::= (PN_PREFIX ":")? PN_LOCAL | PN_PREFIX ":"
 
 PREFX::=  PN_PREFIX
 DIGIT::=[0-9]
@@ -184,7 +184,7 @@
 INT_LITERAL::= '-'? DIGIT+
 
 
-[149s] QUALNAME_LITERAL ::= '\'' QUALNAME '\'' 
+[149s] QUALIFIED_NAME_LITERAL ::= '\'' QUALIFIED_NAME '\'' 
 
 
  
--- a/model/grammar/yack/prov-n-LL.bnf.html	Wed May 16 09:18:04 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Wed May 16 09:23:56 2012 +0100
@@ -411,7 +411,7 @@
 <td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">46</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">identifier</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-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -420,7 +420,7 @@
 <td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">47</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">attribute</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-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -457,7 +457,7 @@
 <td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">51</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-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -468,7 +468,7 @@
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span><br/>
 | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INT_LITERAL">INT_LITERAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></span></code></td>
 </tr>
 </tbody>
 
@@ -486,7 +486,7 @@
 <td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">namespaceDeclaration</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
+<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
 </tr>
 </tbody>
 
@@ -510,8 +510,8 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">QUALNAME</code>&gt;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">57</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/>
 | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":"</code></td>
@@ -583,10 +583,10 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">QUALNAME_LITERAL</code>&gt;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">65</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-QUALNAME">QUALNAME</a></span> "'"</code></td>
+<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
 </tr>
 </tbody>
 
--- a/model/prov-n.html	Wed May 16 09:18:04 2012 +0100
+++ b/model/prov-n.html	Wed May 16 09:23:56 2012 +0100
@@ -271,13 +271,13 @@
 
 
 
-<h4>First Public Working Draft</h4>
- <p>This is the first public release of the PROV-N
-document. Following feedback, the Working Group has decided to
-reorganize the PROV-DM document substantially, separating the data model,
-from its constraints, and the notation used to illustrate it. The
-PROV-N release is synchronized with the release of the PROV-DM, PROV-O,
-PROV-PRIMER, and PROV-CONSTRAINTS documents.
+<!-- <h4>First Public Working Draft</h4> -->
+<!--  <p>This is the first public release of the PROV-N -->
+<!-- document. Following feedback, the Working Group has decided to -->
+<!-- reorganize the PROV-DM document substantially, separating the data model, -->
+<!-- from its constraints, and the notation used to illustrate it. The -->
+<!-- PROV-N release is synchronized with the release of the PROV-DM, PROV-O, -->
+<!-- PROV-PRIMER, and PROV-CONSTRAINTS documents. -->
 </section>
 
 
@@ -1571,7 +1571,65 @@
 </section>
 
 <section id="component5"> 
-<h3>Component 5: Collections</h3>
+<h3>Component 5: Bundles</h3>
+
+<section id="expression-bundle-declaration"> 
+<h4>Bundle Declaration</h4>
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
+</table>
+
+<div class="anexample">
+    <pre class="codeexample">
+bundle ex:author-view
+  agent(ex:Paolo,   [ prov:type='prov:Person' ])
+  agent(ex:Simon,   [ prov:type='prov:Person' ])
+  ...
+endBundle
+  </pre>
+<p> Here  <span class="name">ex:author-view</span> is the name of the bundle.
+</div>
+
+</section>
+
+
+<section id="expression-provenance-locator"> 
+<h4>Provenance Locator</h4>
+
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-provenanceLocatorExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-iriOrMarker"></tbody>
+</table>
+
+
+<div class="anexample">
+    <pre class="codeexample">
+
+bundle bob:bundle4
+  entity(ex:report1, ...)
+endBundle
+
+bundle alice:bundle5
+  entity(ex:report1)
+  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)   
+  entity(ex:report2, ...)
+  wasDerivedFrom(ex:report2, ex:report1)
+endBundle
+</pre>
+
+In bundle <span class="name">alice:bundle5</span>, there is a description for entity <span class="name">ex:report1</span>, and a provenance locator pointing to bundle <span class="name">bob:bundle4</span>. 
+The locator indicates that some provenance description for <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle4</span>. 
+</div>
+
+</section>
+</section>
+
+
+
+<section id="component6"> 
+<h3>Component 6: Collections</h3>
 
 
 In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
@@ -1755,66 +1813,10 @@
 
 </section>   <!-- end collections-->
 
-<section id="component6"> 
-<h3>Component 6: Bundles</h3>
-
-<section id="expression-bundle-declaration"> 
-<h4>Bundle Declaration</h4>
-
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
-</table>
-
-<div class="anexample">
-    <pre class="codeexample">
-bundle ex:author-view
-  agent(ex:Paolo,   [ prov:type='prov:Person' ])
-  agent(ex:Simon,   [ prov:type='prov:Person' ])
-  ...
-endBundle
-  </pre>
-<p> Here  <span class="name">ex:author-view</span> is the name of the bundle.
-</div>
-
-</section>
-
-
-<section id="expression-provenance-locator"> 
-<h4>Provenance Locator</h4>
-
-
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-provenanceLocatorExpression"></tbody>
-<tbody class="grammar-ref" data-ref="prod-iriOrMarker"></tbody>
-</table>
-
-
-<div class="anexample">
-    <pre class="codeexample">
-
-bundle bob:bundle4
-  entity(ex:report1, ...)
-endBundle
-
-bundle alice:bundle5
-  entity(ex:report1)
-  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)   
-  entity(ex:report2, ...)
-  wasDerivedFrom(ex:report2, ex:report1)
-endBundle
-</pre>
-
-In bundle <span class="name">alice:bundle5</span>, there is a description for entity <span class="name">ex:report1</span>, and a provenance locator pointing to bundle <span class="name">bob:bundle4</span>. 
-The locator indicates that some provenance description for <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle4</span>. 
-</div>
-
-</section>
-</section>
-
-
-
-
-
+
+
+
+<!--
 
 <section id="component6"> 
 <h3>Component 6: Annotations (OBSOLETE, TO DISAPPEAR)</h3>
@@ -1865,32 +1867,13 @@
 
 </section>
 
-<!--
-<section  id="second-class-elements">
-<section id="expression-NamespaceDeclaration">
-</section>
-<section id="expression-identifier">
-</section>
-<section id="expression-attribute">
-<section id="expression-attribute-role">
-</section>
-<section id="expression-attribute-type">
-</section>
-<section id="expression-attribute-label">
-</section>
-<section id="expression-attribute-location">
-</section>
-</section>
-<section id="expression-value">
-</section>
+
+
+
 </section>
 
 -->
 
-</section>
-
-
-
 <section  id="subexpressions">
 <h3>Further Expressions</h3>
 
@@ -1965,7 +1948,7 @@
 <span class="nonterminal">agIdentifier</span>&nbsp;::=  <span class="nonterminal">identifier</span><br/>
 <span class="nonterminal">gIdentifier</span>&nbsp;::=  <span class="nonterminal">identifier</span><br/>
 
-<span class="nonterminal">identifier</span>&nbsp;::=  <span class="nonterminal">QUALNAME</span><br/>
+<span class="nonterminal">identifier</span>&nbsp;::=  <span class="nonterminal">QUALIFIED_NAME</span><br/>
 <span class="nonterminal">eIdentifier</span>&nbsp;::=  <span class="nonterminal">identifier</span>  <em>(intended to denote an entity)</em><br/>
 <span class="nonterminal">aIdentifier</span>&nbsp;::=  <span class="nonterminal">identifier</span>  <em>(intended to denote an activity)</em><br/>
 <span class="nonterminal">agIdentifier</span>&nbsp;::=  <span class="nonterminal">identifier</span>  <em>(intended to denote an agent)</em><br/>
@@ -1977,7 +1960,7 @@
 -->
 
 
-<p>A PROV qualified name <a class="grammarRef" href="#term-prov_n_LL-QUALNAME">QUALNAME</a> has a more permissive syntax then XML's <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a> [[!XML-NAMES]]
+<p>A PROV qualified name <a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a> has a more permissive syntax then XML's <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a> [[!XML-NAMES]]
 and SPARQL <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#rPrefixedName">PrefixedName</a> [[!RDF-SPARQL-QUERY]]. It is a PROV requirement that the concatenation of the namespace with the local part results in a valid IRI [[!IRI]]. Given that 
 ',' (comma),
 ';' (semi-colon),
@@ -1989,7 +1972,7 @@
 </p>
 
 
-<p>Qualified names <a class="grammarRef" href="#term-prov_n_LL-QUALNAME">QUALNAME</a> consist of a prefix and a local part. Prefixes follow the production <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL">PN_LOCAL</a>, which extends the original SPARQL <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a> definition by allowing further characters and %-escaped charaters (see <a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a>).</p>
+<p>Qualified names <a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a> consist of a prefix and a local part. Prefixes follow the production <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL">PN_LOCAL</a>, which extends the original SPARQL <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a> definition by allowing further characters and %-escaped charaters (see <a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a>).</p>
 
  
 <table class="grammar">
@@ -2007,7 +1990,7 @@
 <tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"></tbody>
 <tbody class="grammar-ref" data-ref="prod-identifier"></tbody>
 
-<tbody class="grammar-ref" data-ref="prod-QUALNAME"></tbody>
+<tbody class="grammar-ref" data-ref="prod-QUALIFIED_NAME"></tbody>
 <tbody class="grammar-ref" data-ref="prod-PN_LOCAL"></tbody>
 <tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"></tbody>
 <tbody class="grammar-ref" data-ref="prod-PERCENT"></tbody>
@@ -2023,13 +2006,13 @@
 <td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">31</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">identifier</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
 </tr>
 </tbody>
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">39</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">QUALNAME</code>&gt;</td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">39</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="#term-prov_n_LL-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>
@@ -2175,11 +2158,11 @@
 <tbody class="grammar-ref" data-ref="prod-literal"></tbody>
 <tbody class="grammar-ref" data-ref="prod-typedLiteral"></tbody>
 <tbody class="grammar-ref" data-ref="prod-datatype"></tbody>
-<tbody><tr valign="baseline"><td></td><td><em>where <a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a> is listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tbody>
+<tbody><tr valign="baseline"><td></td><td><em>where <a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a> is listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tbody>
 <tbody class="grammar-ref" data-ref="prod-convenienceNotation"></tbody>
 <tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"></tbody>
 <tbody class="grammar-ref" data-ref="prod-INT_LITERAL"></tbody>
-<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-QUALIFIED_NAME_LITERAL"></tbody>
 </table>
 
 
@@ -2188,11 +2171,11 @@
 <p>The non terminals
 <a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a>,
 <a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a>, and
-<a class="grammarRef" href="#prod-QUALNAME_LITERAL">QUALNAME_LITERAL</a>
+<a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a>
 are syntactic sugar for quoted strings with datatype 
 <a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a>,
 <a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, and
-<a class="grammarRef" href="#prod-QUALNAME">prov:QUALNAME</a>
+<a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a>
 respectively.
 </p>
 
@@ -2202,7 +2185,7 @@
 <caption id="permitted-datatypes">Permitted datatypes in literals</caption>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td>  <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td>  <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="#prod-QUALNAME">prov:QUALNAME</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
@@ -2216,7 +2199,7 @@
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:QName</a></td><td></td></tr>
 </table>
 
-<p><b>Note:</b>The productions for <a class="grammarRef" href="#prod-QUALNAME">prov:QUALNAME</a> and
+<p><b>Note:</b>The productions for <a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a> and
 <a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a> are conflicting.  In the context of a 
 <a class="grammarRef" href="#prod-literal">literal</a>, a parser should give precedence to the production for
 <a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a>.
prov

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org