ISSUE-496
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Tue, 16 Oct 2012 12:34:12 +0100
changeset 4528 7eeff918335f
parent 4526 dc49694f142f
child 4529 c4ec22c3a69e
ISSUE-496
model/diff-n.html
model/grammar.txt
model/grammar/Makefile
model/prov-n.html
--- a/model/diff-n.html	Tue Oct 16 09:35:57 2012 +0100
+++ b/model/diff-n.html	Tue Oct 16 12:34:12 2012 +0100
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
 <html lang="en" dir="ltr">
 <head><style type="text/css"><!--
@@ -1027,7 +1026,7 @@
 <li>Readers seeking to implement other PROV serializations
 should focus on PROV-DM and PROV-CONSTRAINTS.  PROV-O and PROV-N offer examples of mapping to RDF and text, respectively.</li>
 </ul>
-<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Last Call Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:[email protected]">[email protected]</a> (<a href="mailto:[email protected]?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>).<span class="delete"> The Last Call period ends 18 September 2012.</span> All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.<span class="delete">This is a Last Call Working Draft and thus the Working Group has determined that this document has satisfied the relevant technical requirements and is sufficiently stable to advance through the Technical Recommendation process.</span></p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and Target Audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno">2.3 </span>Main Productions</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.4 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.5 </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno">2.6 </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-primary-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle Constructor</a></li><li class="tocline"><a href="#expression-bundle-type" class="tocxref"><span class="secno">3.4.2 </span>Bundle Type</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li><li class="tocline"><a href="#semantic-rules-summary" class="tocxref"><span class="secno">3.7.5 </span>Summary of additional semantic rules</a></li></ul></li></ul></li><li class="tocline"><a href="#document" class="tocxref"><span class="secno">4. </span><span class="delete">Toplevel Bundle</span><span class="insert">Document</span></a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno">5. </span>Extensibility</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#changes-since-last-version" class="tocxref"><span class="secno"><span class="insert">A. </span></span><span class="insert">Changes since last version</span></a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno"><span class="delete">A.</span><span class="insert">B.</span> </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno"><span class="delete">B.</span><span class="insert">C.</span> </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno"><span class="delete">B.1</span><span class="insert">C.1</span> </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno"><span class="delete">B.2</span><span class="insert">C.2</span> </span>Informative references</a></li></ul></li></ul></div> 
+<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Last Call Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:[email protected]">[email protected]</a> (<a href="mailto:[email protected]?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>).<span class="delete"> The Last Call period ends 18 September 2012.</span> All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.<span class="delete">This is a Last Call Working Draft and thus the Working Group has determined that this document has satisfied the relevant technical requirements and is sufficiently stable to advance through the Technical Recommendation process.</span></p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and Target Audience</a></li><li class="tocline"><a href="#compliance-with-this-document" class="tocxref"><span class="secno"><span class="insert">1.2 </span></span><span class="insert">Compliance with this Document</span></a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno"><span class="delete">1.2</span><span class="insert">1.3</span> </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno"><span class="delete">1.3</span><span class="insert">1.4</span> </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno">2.3 </span>Main Productions</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.4 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.5 </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno">2.6 </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-primary-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle Constructor</a></li><li class="tocline"><a href="#expression-bundle-type" class="tocxref"><span class="secno">3.4.2 </span>Bundle Type</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection" class="tocxref"><span class="secno">3.6.1 </span>Collection</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.2 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li><li class="tocline"><a href="#semantic-rules-summary" class="tocxref"><span class="secno">3.7.5 </span>Summary of additional semantic rules</a></li></ul></li></ul></li><li class="tocline"><a href="#document" class="tocxref"><span class="secno">4. </span><span class="delete">Toplevel Bundle</span><span class="insert">Document</span></a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno">5. </span>Extensibility</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#changes-since-last-version" class="tocxref"><span class="secno"><span class="insert">A. </span></span><span class="insert">Changes since last version</span></a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno"><span class="delete">A.</span><span class="insert">B.</span> </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno"><span class="delete">B.</span><span class="insert">C.</span> </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno"><span class="delete">B.1</span><span class="insert">C.1</span> </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno"><span class="delete">B.2</span><span class="insert">C.2</span> </span>Informative references</a></li></ul></li></ul></div> 
 
 
 
@@ -1080,8 +1079,26 @@
 
 </div>
 
+    
+
+<div id="compliance-with-this-document" class="section"> 
+<h3><span class="secno"><span class="insert">1.2 </span></span><span class="insert">Compliance with this Document</span></h3>
+
+
+<p><span class="insert">For the purpose of compliance, all sections of this document are normative, except 
+</span><a href="#changes-since-last-version"><span class="insert">Appendix A</span></a><span class="insert">, 
+</span><a href="#acknowledgements"><span class="insert">Appendix B</span></a><span class="insert">,  and
+</span><a href="#informative-references"><span class="insert">Appendix C.2</span></a><span class="insert">.
+</span></p><ul>
+<li><span class="insert"> Information in tables is normative. </span></li>
+<li><span class="insert"> Text in boxes labeled "Example" is informative.
+</span></li><li><span class="insert"> Productions (displayed in boxes) are normative, as opposed to the separate </span><a href="grammar.txt"><span class="insert">file</span></a><span class="insert"> grouping  all productions for convenience of programmers, which is informative.
+</span></li></ul>
+</div>
+
+
     <div id="structure-of-this-document" class="section"> 
-<h3><span class="secno">1.2 </span>Structure of this Document</h3>
+<h3><span class="secno"><span class="delete">1.2</span><span class="insert">1.3</span> </span>Structure of this Document</h3>
 
 <p>This document is structured as follows.
 
@@ -1100,7 +1117,7 @@
 
 
 <div id="notational-conventions" class="section">
- <h3><span class="secno">1.3 </span>Notational Conventions</h3>
+ <h3><span class="secno"><span class="delete">1.3</span><span class="insert">1.4</span> </span>Notational Conventions</h3>
 
 
 
@@ -1133,6 +1150,9 @@
 <div id="general-conventions" class="section">
 <h2><span class="secno">2. </span>General grammar considerations</h2>
 
+<p><span class="insert">For convenience, all productions presented in this document have been grouped in a
+separate </span><a href="grammar.txt"><span class="insert">file</span></a><span class="insert">.</span></p>
+
 <div id="functional-syntax" class="section"> 
 <h3><span class="secno">2.1 </span>Functional-style Syntax</h3>
 
@@ -1374,6 +1394,8 @@
 
 
 
+
+
 </p><table class="grammar">
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-entityExpression" name="prod-entityExpression"></a>[<span class="prodNo">3</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">entityExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"entity" "(" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-optionalAttributeValuePairs" name="prod-optionalAttributeValuePairs"></a>[<span class="prodNo">4</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">optionalAttributeValuePairs</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( "," "[" <span class="prod"><a class="grammarRef" href="#prod-attributeValuePairs">attributeValuePairs</a></span> "]" )?</code></td> </tr> </tbody>
@@ -1385,7 +1407,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Entity maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Entity</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-entity">Entity</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.id"><span class="attribute" id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.attributes"><span class="attribute" id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
@@ -1412,6 +1434,9 @@
 
 
 
+
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-activityExpression" name="prod-activityExpression"></a>[<span class="prodNo">7</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">activityExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"activity" "(" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -1421,7 +1446,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Activity maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Activity</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-activity">Activity</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.id"><span class="attribute" id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 
@@ -1473,7 +1498,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Generation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Generation</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasgeneratedby">Generation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class="attribute" id="generation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.entity"><span class="attribute" id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
@@ -1516,6 +1541,8 @@
 
 
 
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-usageExpression" name="prod-usageExpression"></a>[<span class="prodNo">12</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">usageExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -1525,7 +1552,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Usage maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Usage</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-used">Usage</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute" id="usage.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.activity"><span class="attribute" id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute" id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
@@ -1558,6 +1585,10 @@
 
 
 
+
+
+
+
 </div>
 
 <div id="expression-wasInformedBy" class="section">
@@ -1566,6 +1597,8 @@
 
 
 
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-communicationExpression" name="prod-communicationExpression"></a>[<span class="prodNo">13</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">communicationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasInformedBy" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -1576,7 +1609,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Communication maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Communication</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinformedby">Communication</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class="attribute" id="communication.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informed"><span class="attribute" id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1616,7 +1649,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Start maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Start</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasstartedby">Start</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#start.id"><span class="attribute" id="start.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#start.activity"><span class="attribute" id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1655,6 +1688,9 @@
 
 
 
+
+
+
 </div>
 
 <div id="expression-End" class="section">
@@ -1662,6 +1698,8 @@
 
 
 
+
+
 <table class="grammar">
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-endExpression" name="prod-endExpression"></a>[<span class="prodNo">15</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">endExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasEndedBy" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
 </table>
@@ -1670,7 +1708,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM End maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>End</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasendedby">End</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute" id="end.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#end.activity"><span class="attribute" id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1711,6 +1749,8 @@
 
 
 
+
+
 </div>
 
 
@@ -1722,6 +1762,8 @@
 <div class="withPn">
 
 
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-invalidationExpression" name="prod-invalidationExpression"></a>[<span class="prodNo">16</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">invalidationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasInvalidatedBy" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -1731,7 +1773,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Invalidation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Invalidation</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinvalidatedby">Invalidation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute" id="invalidation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.entity"><span class="attribute" id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
@@ -1767,12 +1809,20 @@
 
 
 
+
+
+
 </div></div>
 
 
 
 
 
+
+
+
+
+
 </div>
 
 <div id="component2" class="section"> 
@@ -1781,6 +1831,8 @@
 <h4><span class="secno">3.2.1 </span>Derivation</h4>
 
 
+
+
 <table class="grammar">
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-derivationExpression" name="prod-derivationExpression"></a>[<span class="prodNo">17</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">derivationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasDerivedFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
 </table>
@@ -1788,7 +1840,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Derivation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Derivation</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasderivedfrom">Derivation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.id"><span class="attribute" id="derivation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -1926,7 +1978,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Agent maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Agent</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-agent">Agent</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.id"><span class="attribute" id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.attributes"><span class="attribute" id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
@@ -1960,6 +2012,9 @@
 
 
 
+
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributionExpression" name="prod-attributionExpression"></a>[<span class="prodNo">19</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">attributionExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasAttributedTo" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -1970,7 +2025,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Attribution maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Attribution</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasattributedto">Attribution</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.id"><span class="attribute" id="attribution.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.entity"><span class="attribute" id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">eIdentifier</a></code></td></tr>
@@ -2005,6 +2060,9 @@
 
 
 
+
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-associationExpression" name="prod-associationExpression"></a>[<span class="prodNo">20</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">associationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasAssociatedWith" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-agIdentifierOrMarker">agIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -2015,7 +2073,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Association maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Association</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasassociatedwith">Association</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="attribute" id="association.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -2069,6 +2127,9 @@
 
 
 
+
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-delegationExpression" name="prod-delegationExpression"></a>[<span class="prodNo">21</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">delegationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"actedOnBehalfOf" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
@@ -2078,7 +2139,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Delegation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Delegation</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-actedonbehalfof">Delegation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.id"><span class="attribute" id="delegation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -2132,7 +2193,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Influence maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Influence</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinfluencedby">Influence</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class="attribute" id="influence.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -2181,6 +2242,26 @@
 
 <p><span class="delete">Named bundles</span><span class="insert">Bundles</span> are self-contained: each identifier occuring in a<span class="delete"> named</span> bundle, including the bundle identifier itself, <em class="rfc2119" title="must">must</em> be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a <span class="delete">named </span>bundle, there <em class="rfc2119" title="must">must</em> be a namespace declaration for <code>p</code> in this <span class="delete">named </span>bundled; for every identifier  without prefix, there <em class="rfc2119" title="must">must</em> be a default namespace declaration  in this <span class="delete">named bundled.</span><span class="insert">bundle.</span></p>
 
+
+
+
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM bundle maps to a PROV-N syntax element.</span></p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-bundle"><span class="insert">Bundle</span></a></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#bundle.constructor.id"><span class="attribute" id="bundle.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#bundle.constructor.descriptions"><span class="attribute" id="bundle.descriptions"><span class="insert">descriptions</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#dfn-namespaceDeclaration"><span class="attribute" id="namespaceDeclaration"><span class="insert">namespaceDeclaration</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></code></td></tr>
+
+
+</tbody></table>
+</div>
+
+
 <div class="anexample" id="example_28"><div class="anexampleTitle"><a class="internalDFN" href="#example_28">Example 28</a></div>
     <pre class="codeexample">bundle ex:author-view
   prefix ex  &lt;http://example.org/&gt;
@@ -2226,7 +2307,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Alternate maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Alternate</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-alternateof">Alternate</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -2252,6 +2333,9 @@
 
 
 
+
+
+
 <table class="grammar">
 
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-specializationExpression" name="prod-specializationExpression"></a>[<span class="prodNo">25</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">specializationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"specializationOf" "(" <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> ")"</code></td> </tr> </tbody>
@@ -2261,7 +2345,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Specialization maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Specialization</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-specializationof">Specialization</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -2304,7 +2388,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Mention maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Mention</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-mentionof">Mention</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -2368,7 +2452,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Membership maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b>Membership</b></td><td><b>Non-Terminal</b></td></tr>
+<tbody><tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-hadmember">Membership</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -2377,6 +2461,7 @@
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.entity"><span class="attribute" id="membership.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
 
 
+
 </tbody></table>
 </div>
 
@@ -2403,6 +2488,12 @@
 
 
 
+   
+
+
+
+
+
 <div id="subexpressions" class="section">
 <h3><span class="secno">3.7 </span>Further Expressions</h3>
 
@@ -2733,9 +2824,11 @@
 A <code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></code> consists of a namespace. Every qualified name without prefix in the scope of this declaration belongs to this namespace. Scope of a declaration is specified as follows:</p>
 <ul>
 <li> 
-The scope of a namespace declaration directly occurring in a <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> is the <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> itself;</li>
-<li>
-the scope of a namespace declaration directly occurring in a <code><span class="delete">toplevel bundle</span><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code> is<span class="insert"> the </span><code><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code><span class="insert"> itself, except</span> the <code><a class="grammarRef" href="#prod-bundle"><span class="delete">toplevel bundle</span><span class="delete"> itself, except and </span><span class="delete">namedBundle</span><span class="insert">bundles</span></a></code> it may contain.</li>
+The scope of a namespace declaration directly occurring in a <code><span class="delete">namedBundle</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a></code> is the <span class="delete">namedBundle</span><span class="delete"> itself;</span>
+<span class="delete">
+the scope of a namespace declaration directly occurring in a</span> <code><a class="grammarRef" href="#prod-bundle"><span class="delete">toplevel </span>bundle</a></code> <span class="insert">itself.</span></li>
+<li><span class="insert">
+The scope of a namespace declaration directly occurring in a </span><code><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code> is<span class="insert"> the </span><code><a class="grammarRef" href="#prod-document"><span class="insert">document</span></a></code><span class="insert"> itself, exclunding</span> the <code><a class="grammarRef" href="#prod-bundle"><span class="delete">toplevel bundle</span><span class="delete"> itself, except and </span><span class="delete">namedBundle</span><span class="insert">bundles</span></a></code> it may contain.</li>
 </ul>
 
 <p>A set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code> <em class="rfc2119" title="must not">must not</em> re-declare the same prefix.</p>
@@ -3046,17 +3139,19 @@
 
 
 
-<div class="appendix section" id="changes-since-last-version"> 
-      <h2><span class="secno"><span class="insert">A. </span></span><span class="insert">Changes since last version</span></h2> 
+<div class="appendix informative section" id="changes-since-last-version"> 
+      <h2><span class="secno">A. </span><span class="insert">Changes since last version</span></h2><p><em><span class="insert">This section is non-normative.</span></em></p> 
       <p> 
 </p><ul>
 <p> <a href="http://www.w3.org/2011/prov/track/issues/543"><span class="insert">ISSUE-543</span></a><span class="insert">: uses key-entity pair terminology for example 43.
 </span></p><p> <a href="http://www.w3.org/2011/prov/track/issues/538"><span class="insert">ISSUE-538</span></a><span class="insert">: rephrasing of text in example 10.
+</span></p><p> <a href="http://www.w3.org/2011/prov/track/issues/547"><span class="insert">ISSUE-547</span></a><span class="insert">: aligned terminology and productions with prov-constraints document, renaming 'toplevel bundle' to 'document', and renaming 'named bundle' to 'bundle'.
+</span></p><p> <a href="http://www.w3.org/2011/prov/track/issues/496"><span class="insert">ISSUE-496</span></a><span class="insert">: For each prov-n term, added a cross-reference to corresponding prov-dm term (see table following each production). Rephrased text related to scope of a namespace declaration. Added an informative file with all productions.
 </span></p></ul>
 </div>
 
-<div class="appendix section" id="acknowledgements"> 
-      <h2><span class="secno"><span class="delete">A.</span><span class="insert">B.</span> </span>Acknowledgements</h2> 
+<div class="appendix informative section" id="acknowledgements"> 
+      <h2><span class="secno"><span class="insert">B. </span></span>Acknowledgements</h2><p><em><span class="insert">This section is non-normative.</span></em></p> 
       <p> 
 
 This  document has been produced by the PROV Working Group, and its contents reflect extensive discussion within the Working Group as a whole. 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/grammar.txt	Tue Oct 16 12:34:12 2012 +0100
@@ -0,0 +1,149 @@
+]>
+
+Productions:
+
+[1]  document                       :: "document" (namespaceDeclarations)? (expression)* (bundle)* "endDocument"
+                                 =   
+[2]  expression                     :: ( entityExpression | activityExpression | generationExpression | usageExpression
+                                 =     | startExpression | endExpression | invalidationExpression | 
+                                       communicationExpression | agentExpression | associationExpression | 
+                                       attributionExpression | delegationExpression | derivationExpression | 
+                                       influenceExpression | alternateExpression | specializationExpression | 
+                                       mentionExpression | membershipExpression | extensibilityExpression )
+[3]  entityExpression               :: "entity" "(" identifier optionalAttributeValuePairs ")"
+                                 =   
+[4]  optionalAttributeValuePairs    :: (( "," "[" attributeValuePairs "]" ))?
+                                 =   
+[5]  attributeValuePairs            :: ( | attributeValuePair (( "," attributeValuePair ))* )
+                                 =   
+[6]  attributeValuePair             :: attribute "=" literal
+                                 =   
+[7]  activityExpression             :: "activity" "(" identifier (( "," timeOrMarker "," timeOrMarker ))? 
+                                 =     optionalAttributeValuePairs ")"
+[8]  timeOrMarker                   :: ( timeZZ | "-" )
+                                 =   
+[9]  generationExpression           :: "wasGeneratedBy" "(" optionalIdentifier eIdentifier (( "," aIdentifierOrMarker
+                                 =     "," timeOrMarker ))? optionalAttributeValuePairs ")"
+[10] optionalIdentifier             :: (( identifierOrMarker ";" ))?
+                                 =   
+[11] identifierOrMarker             :: ( identifier | "-" )
+                                 =   
+[12] usageExpression                :: "used" "(" optionalIdentifier aIdentifier (( "," eIdentifierOrMarker "," 
+                                 =     timeOrMarker ))? optionalAttributeValuePairs ")"
+[13] communicationExpression        :: "wasInformedBy" "(" optionalIdentifier aIdentifier "," aIdentifier 
+                                 =     optionalAttributeValuePairs ")"
+[14] startExpression                :: "wasStartedBy" "(" optionalIdentifier aIdentifier (( "," eIdentifierOrMarker ","
+                                 =     aIdentifierOrMarker "," timeOrMarker ))? optionalAttributeValuePairs ")"
+[15] endExpression                  :: "wasEndedBy" "(" optionalIdentifier aIdentifier (( "," eIdentifierOrMarker "," 
+                                 =     aIdentifierOrMarker "," timeOrMarker ))? optionalAttributeValuePairs ")"
+[16] invalidationExpression         :: "wasInvalidatedBy" "(" optionalIdentifier eIdentifier (( "," aIdentifierOrMarker
+                                 =     "," timeOrMarker ))? optionalAttributeValuePairs ")"
+[17] derivationExpression           :: "wasDerivedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier (( "," 
+                                 =     aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker ))? 
+                                       optionalAttributeValuePairs ")"
+[18] agentExpression                :: "agent" "(" identifier optionalAttributeValuePairs ")"
+                                 =   
+[19] attributionExpression          :: "wasAttributedTo" "(" optionalIdentifier eIdentifier "," agIdentifier 
+                                 =     optionalAttributeValuePairs ")"
+[20] associationExpression          :: "wasAssociatedWith" "(" optionalIdentifier aIdentifier (( "," 
+                                 =     agIdentifierOrMarker "," eIdentifierOrMarker ))? optionalAttributeValuePairs ")"
+[21] delegationExpression           :: "actedOnBehalfOf" "(" optionalIdentifier agIdentifier "," agIdentifier (( "," 
+                                 =     aIdentifierOrMarker ))? optionalAttributeValuePairs ")"
+[22] influenceExpression            :: "wasInfluencedBy" "(" optionalIdentifier eIdentifier "," eIdentifier 
+                                 =     optionalAttributeValuePairs ")"
+[23] bundle                         :: "bundle" identifier (namespaceDeclarations)? (expression)* "endBundle"
+                                 =   
+[24] alternateExpression            :: "alternateOf" "(" eIdentifier "," eIdentifier ")"
+                                 =   
+[25] specializationExpression       :: "specializationOf" "(" eIdentifier "," eIdentifier ")"
+                                 =   
+[26] mentionExpression              :: "mentionOf" "(" eIdentifier "," eIdentifier "," bIdentifier ")"
+                                 =   
+[27] membershipExpression           :: "hadMember" "(" cIdentifier "," eIdentifier ")"
+                                 =   
+[28] eIdentifier                    :: identifier
+                                 =   
+[29] aIdentifier                    :: identifier
+                                 =   
+[30] agIdentifier                   :: identifier
+                                 =   
+[31] gIdentifier                    :: identifier
+                                 =   
+[32] uIdentifier                    :: identifier
+                                 =   
+[33] cIdentifier                    :: identifier
+                                 =   
+[34] bIdentifier                    :: identifier
+                                 =   
+[35] eIdentifierOrMarker            :: ( eIdentifier | "-" )
+                                 =   
+[36] aIdentifierOrMarker            :: ( aIdentifier | "-" )
+                                 =   
+[37] agIdentifierOrMarker           :: ( agIdentifier | "-" )
+                                 =   
+[38] gIdentifierOrMarker            :: ( gIdentifier | "-" )
+                                 =   
+[39] uIdentifierOrMarker            :: ( uIdentifier | "-" )
+                                 =   
+[40] identifier                     :: QUALIFIED_NAME
+                                 =   
+[41] attribute                      :: QUALIFIED_NAME
+                                 =   
+[42] literal                        :: typedLiteral
+                                 =     | convenienceNotation
+[43] typedLiteral                   :: STRING_LITERAL "%%" datatype
+                                 =   
+[44] datatype                       :: QUALIFIED_NAME
+                                 =   
+[45] convenienceNotation            :: STRING_LITERAL (LANGTAG)?
+                                 =     | INT_LITERAL
+                                       | QUALIFIED_NAME_LITERAL
+[46] timeZZ                         :: DATETIME
+                                 =   
+[47] namespaceDeclarations          :: ( defaultNamespaceDeclaration | namespaceDeclaration ) (namespaceDeclaration)*
+                                 =   
+[48] namespaceDeclaration           :: "prefix" PN_PREFIX namespace
+                                 =   
+[49] defaultNamespaceDeclaration    :: "default" IRI_REF
+                                 =   
+[50] namespace                      :: IRI_REF
+                                 =   
+[51] extensibilityExpression        :: QUALIFIED_NAME "(" optionalIdentifier extensibilityArgument (( "," 
+                                 =     extensibilityArgument ))* optionalAttributeValuePairs ")"
+[52] extensibilityArgument          :: ( identifierOrMarker | literal | timeZZ | extensibilityExpression | 
+                                 =     extensibilityTuple )
+[53] extensibilityTuple             :: "{" extensibilityArgument (( "," extensibilityArgument ))* "}"
+                                 =     | "(" extensibilityArgument (( "," extensibilityArgument ))* ")"
+[54] <QUALIFIED_NAME>               :: (( PN_PREFIX ":" ))? PN_LOCAL
+                                 =     | PN_PREFIX ":"
+[55] <PN_LOCAL>                     :: ( PN_CHARS_U | [0-9] | PN_CHARS_OTHERS ) (( (( PN_CHARS | "." | PN_CHARS_OTHERS
+                                 =     ))* ( PN_CHARS | PN_CHARS_OTHERS ) ))?
+[56] <PN_CHARS_OTHERS>              :: "/"
+                                 =     | "@"
+                                       | "~"
+                                       | "&"
+                                       | "+"
+                                       | "*"
+                                       | "?"
+                                       | "#"
+                                       | "$"
+                                       | "!"
+                                       | PERCENT
+                                       | PN_CHARS_ESC
+[57] <PN_CHARS_ESC>                 :: "\\" ( "=" | "'" | "(" | ")" | "," | "-" | ":" | ";" | "[" | "]" | "." )
+                                 =   
+[58] <PERCENT>                      :: "%" HEX HEX
+                                 =   
+[59] <HEX>                          :: [0-9]
+                                 =     | [A-F]
+                                       | [a-f]
+[60] <STRING_LITERAL>               :: STRING_LITERAL2
+                                 =     | STRING_LITERAL_LONG2
+[61] <PREFX>                        :: PN_PREFIX
+                                 =   
+[62] <INT_LITERAL>                  :: ("-")? (DIGIT)+
+                                 =   
+[63] <QUALIFIED_NAME_LITERAL>       :: "'" QUALIFIED_NAME "'"
+                                 =   
+[64] <DIGIT>                        :: [0-9]
+                                 =   
--- a/model/grammar/Makefile	Tue Oct 16 09:35:57 2012 +0100
+++ b/model/grammar/Makefile	Tue Oct 16 12:34:12 2012 +0100
@@ -32,13 +32,21 @@
 IN.HTML=ll.html
 IN2.HTML=tmp/ll2.html
 
-do.ll.js: ll.provn do.ll.html
+do.ll.txt:
+	w3m -dump -cols 120 ll.html > ll.txt
+	sed -n '/65/q;p' ll.txt > ../grammar.txt
+
+
+
+
+do.ll.js: ll.provn do.ll.html do.ll.txt
 	@echo "grammar_string= " > $(OUT.JS)
 	@cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g"  | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/((/(/g" | sed -e "s/))/)/g"   | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_PREFIX/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g"  | sed -e "s/\d035prod-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g"  | sed -e "s/\d035prod-STRING_LITERAL2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL2/g" | sed -e "s/\d035prod-STRING_LITERAL_LONG2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL_LONG2/g" | sed -e "s/\d035prod-LANGTAG/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rLANGTAG/g" | sed -e "s/\d035prod-IRI_REF/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rIRI_REF/g"  | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g"  | sed -e "s/\d035prod-DATETIME\"/http:\d047\d047www.w3.org\d047TR\d047xmlschema11-2\d047\d035nt-dateTimeRep\"/g" > $(IN2.HTML)
 	@cat $(IN2.HTML) | awk '{ print "'\''"  $$0 " '\'' + " }' >> $(OUT.JS)
 	@echo "' ' ;" >> $(OUT.JS)
 
 
+
 run1:
 	cd yack; perl -Mprov_n -e test < sample2.in 3> sample2.trace
 
--- a/model/prov-n.html	Tue Oct 16 09:35:57 2012 +0100
+++ b/model/prov-n.html	Tue Oct 16 12:34:12 2012 +0100
@@ -414,6 +414,22 @@
 
 </section>
 
+<section id="compliance-with-this-document"> 
+<h3>Compliance with this Document</h3>
+
+
+<p>For the purpose of compliance, all sections of this document are normative, except 
+<a href="#changes-since-last-version">Appendix A</a>, 
+<a href="#acknowledgements">Appendix B</a>,  and
+<a href="#informative-references">Appendix C.2</a>.
+<ul>
+<li> Information in tables is normative. </li>
+<li> Text in boxes labeled "Example" is informative.
+<li> Productions (displayed in boxes) are normative, as opposed to the separate <a href="grammar.txt">file</a> grouping  all productions for convenience of programmers, which is informative.
+</ul>
+</section>
+
+
     <section id="structure-of-this-document"> 
 <h3>Structure of this Document</h3>
 
@@ -475,6 +491,9 @@
 <section id="general-conventions">
 <h3>General grammar considerations</h3>
 
+<p>For convenience, all productions presented in this document have been grouped in a
+separate <a href="grammar.txt">file</a>.</p>
+
 <section id="functional-syntax"> 
 <h3>Functional-style Syntax</h3>
 
@@ -725,34 +744,6 @@
 <div class="withPn">
 <p>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">entityExpression</span>&nbsp;::=  
-<span class="name">entity</span>
-<span class="name">(</span>
-<a href="#expression-identifier"><span class="nonterminal">identifier</span></a>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span><br/><br/>
-
-<span class="nonterminal">optional-attribute-values</span>&nbsp;::= 
-<span class="optional"><span class="name">,</span>
-<span class="name">[</span>
-<span class="nonterminal">attribute-values</span>
-<span class="name">]</span>
-</span><br/>
-<span class="nonterminal">attribute-values</span>&nbsp;::=  
-<span class="nonterminal">attribute-value</span>
-| <span class="nonterminal">attribute-value</span> <span class="name">,</span> <span class="nonterminal">attribute-values</span>
-<br/>
-<span class="nonterminal">attribute-value</span>&nbsp;::=  
-<span class="nonterminal">attribute</span>
-<span class="name">=</span>
-<span class="nonterminal">Literal</span>
-<br/>
-</div>
-</div>
--->
-
 <table class="grammar">
 <tbody class="grammar-ref" data-ref="prod-entityExpression"></tbody>
 <tbody class="grammar-ref" data-ref="prod-optionalAttributeValuePairs"></tbody>
@@ -764,7 +755,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Entity maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Entity</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-entity">Entity</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.id"><span class='attribute' id="entity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#entity.attributes"><span class='attribute' id="entity.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
@@ -791,21 +782,6 @@
 <section id="expression-Activity"> 
 <h4>Activity</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">activityExpression</span>&nbsp;::=  
-<span class="name">activity</span>
-<span class="name">(</span>
-<a href="#expression-identifier"><span class="nonterminal">identifier</span></a>
-<span class="optional"><span class="name">,</span>
-(<a href="#expression-Time"><span class="nonterminal">time</span></a> | <span class="name">-</span> )
-<span class="name">,</span>
-(<a href="#expression-Time"><span class="nonterminal">time</span></a> | <span class="name">-</span> )</span>
-<a href="#expression-Entity"><span class="nonterminal">optional-attribute-values</span></a>
-<span class="name">)</span>
-</div>
-</div>
--->
 
 <table class="grammar">
 
@@ -816,7 +792,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Activity maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Activity</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-activity">Activity</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#activity.id"><span class='attribute' id="activity.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 
@@ -857,21 +833,7 @@
 
 <div class="withPn">
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">generationExpression</span>&nbsp;::=  
-<span class="name">wasGeneratedBy</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">eIdentifier</span>(
-<span class="name">,</span>
-( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span> ( <span class="nonterminal">time</span> | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span><br/>
-</div>
-</div>
--->
+
 
 <table class="grammar">
 
@@ -884,7 +846,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Generation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Generation</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasgeneratedby">Generation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class='attribute' id="generation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#generation.entity"><span class='attribute' id="generation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
@@ -929,35 +891,16 @@
 <section id="expression-Usage">
 <h4>Usage</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">usageExpression</span>&nbsp;::=  
-<span class="name">used</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">aIdentifier</span> (
-<span class="name">,</span>
-( <span class="nonterminal">eIdentifier</span> )
-<span class="name">,</span> ( <span class="nonterminal">time</span> | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span><br/>
-</div>
--->
-
 <table class="grammar">
 
 <tbody class="grammar-ref" data-ref="prod-usageExpression"></tbody>
 </table>
-<!--
-<div class="note">should this: 	usageExpression	   ::=   	"used" "(" optionalIdentifier aIdentifier "," eIdentifier ( "," timeOrMarker )? optionalAttributeValuePairs ")"  <br/>
- be:  	usageExpression	   ::=   	"used" "(" optionalIdentifier aIdentifier ( "," eIdentifier  "," timeOrMarker )? optionalAttributeValuePairs ")"   ?
-</div>
--->
+
 
 <p>The following table summarizes how each constituent of a PROV-DM Usage maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Usage</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-used">Usage</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class='attribute' id="usage.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.activity"><span class='attribute' id="usage.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr><tr><td><a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class='attribute' id="usage.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></code></td></tr>
@@ -989,9 +932,6 @@
 
 <p>Additional semantic rules (<a href="#semantic-rules-summary">Section 3.7.5</a>) apply to <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code>.</p>
 
-<!--
-<p><strong>Note:</strong> Even though the production <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code> allows for expressions <span class="name">used(a2, -, -)</span>  and <span class="name">used(-; a2, -, -)</span>, these expressions are not valid in PROV-N, since at least one  of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class='attribute'>entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class='attribute'>time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class='attribute'>attributes</span></a> MUST be present.</p>
--->
 
 
 </section>
@@ -999,21 +939,6 @@
 <section id="expression-wasInformedBy">
 <h4>Communication</h4>
 
-<!--
-<div class="grammar">
-<span class="nonterminal">communicationExpression</span> &nbsp;::= 
-<span class="name">wasInformedBy</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">aIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">aIdentifier</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
-
-
 <table class="grammar">
 
 <tbody class="grammar-ref" data-ref="prod-communicationExpression"></tbody>
@@ -1024,7 +949,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Communication maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Communication</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinformedby">Communication</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.id"><span class='attribute' id="communication.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#communication.informed"><span class='attribute' id="communication.informed">informed</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1066,7 +991,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Start maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Start</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasstartedby">Start</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#start.id"><span class='attribute' id="start.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#start.activity"><span class='attribute' id="start.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1105,31 +1030,12 @@
 
 <p>Additional semantic rules (<a href="#semantic-rules-summary">Section 3.7.5</a>) apply to <code class="content"><a class="grammarRef" href="#prod-startExpression">startExpression</a></code>.</p>
 
-<!--
-<p><strong>Note:</strong> Even though the production <code class="content"><a class="grammarRef" href="#prod-startExpression">startExpression</a></code> allows for expressions <span class="name">wasStartedBy(e2, -, -, -)</span>  and <span class="name">wasStartedBy(-; e2, -, -, -)</span>, these expressions are not valid in PROV-N,
-since at least one  of <a href="http://www.w3.org/TR/prov-dm/#start.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.trigger"><span class='attribute'>trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.starter"><span class='attribute'>starter</span></a>, <a href="http://www.w3.org/TR/prov-dm/#start.time"><span class='attribute'>time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#start.attributes"><span class='attribute'>attributes</span></a> MUST be present (as per [[PROV-DM]]).</p>
--->
 
 </section>
 
 <section id="expression-End">
 <h4>End</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">endExpression</span>&nbsp;::= 
-<span class="name">wasEndedBy</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">aIdentifier</span> (
-<span class="name">,</span>
-( <span class="nonterminal">eIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span> ( <span class="nonterminal">time</span> | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
-
 <table class="grammar">
 <tbody class="grammar-ref" data-ref="prod-endExpression"></tbody>
 </table>
@@ -1138,7 +1044,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM End maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>End</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasendedby">End</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#end.id"><span class='attribute' id="end.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#end.activity"><span class='attribute' id="end.activity">activity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></code></td></tr>
@@ -1179,11 +1085,6 @@
 
 <p>Additional semantic rules (<a href="#semantic-rules-summary">Section 3.7.5</a>) apply to <code class="content"><a class="grammarRef" href="#prod-endExpression">endExpression</a></code>.</p>
 
-<!--
-<p><strong>Note:</strong>Even though the production <code class="content"><a class="grammarRef" href="#prod-endExpression">endExpression</a></code> allows for expressions <span class="name">wasEndedBy(e2, -, -, -)</span>  and <span class="name">wasEndedBy(-; e2, -, -, -)</span>, these expressions are not valid in PROV-N,
-since at least one  of <a href="http://www.w3.org/TR/prov-dm/#end.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class='attribute'>trigger</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.ender"><span class='attribute'>ender</span></a>, <a href="http://www.w3.org/TR/prov-dm/#end.time"><span class='attribute'>time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class='attribute'>attributes</span></a> MUST be present.</p>
--->
-
 </section>
 
 
@@ -1193,21 +1094,6 @@
 
 
 <div class="withPn">
-<!--
-<div class='grammar'>
-<span class="nonterminal">invalidationExpression</span>&nbsp;::=  
-<span class="name">wasInvalidatedBy</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">aIdentifier</span> (
-<span class="name">,</span>
-( <span class="nonterminal">eIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span> ( <span class="nonterminal">time</span> | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
-</div>
--->
 
 <table class="grammar">
 
@@ -1218,7 +1104,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Invalidation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Invalidation</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinvalidatedby">Invalidation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class='attribute' id="invalidation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.entity"><span class='attribute' id="invalidation.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
@@ -1252,53 +1138,11 @@
 
 <p>Additional semantic rules (<a href="#semantic-rules-summary">Section 3.7.5</a>) apply to <code class="content"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></code>.</p>
 
-<!--
-<p><strong>Note:</strong> Even though the production  <code class="content"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></code> allows for expressions <span class="name">wasInvalidatedBy(e2, -, -)</span>  and <span class="name">wasInvalidatedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since 
-since at least one  of <a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class='attribute'>activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class='attribute'>time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class='attribute'>attributes</span></a> MUST be present.</p>
--->
-
-
 
 </section>
 
 
 
-<!--
-<section id="expression-startByActivity">
-<h4>Start by Activity</h4>
-
-<div class="grammar">
-<span class="nonterminal">startByActivityExpression</span> &nbsp;::= 
-<span class="name">wasStartedByActivity</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">aIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">aIdentifier</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-<br>
-</div>
-
-<div class="anexample">
-<pre class="codeexample">
-wasStartedByActivity(s,ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
-  </pre>
-<p>  Here <span class="name">s</span> is the optional start-by-activity identifier,  <span class="name">ex:a1</span> is the identifier of the starting activity,
-  <span class="name">ex:a2</span> is the identifier of the activity that started  <span class="name">ex:a1</span>,
-and <span class="name"> [ex:param1="a", ex:param2="b"]</span> are optional attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-  
-  <pre class="codeexample">
-wasStartedByActivity(ex:a1, ex:a2)
-wasStartedByActivity(ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
-wasStartedByActivity(s,ex:a1, ex:a2)
-wasStartedByActivity(-,ex:a1, ex:a2)
-wasStartedByActivity(-,ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
-</pre>
-</div>
-</section>
--->
 
 </section>
 
@@ -1307,27 +1151,6 @@
 <section id="Derivation-Relation">
 <h4>Derivation</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">derivationExpression</span>&nbsp;::= 
-<span class="name">wasDerivedFrom</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="optional">
-<span class="name">,</span>
-( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span>
-( <span class="nonterminal">gIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span>
-( <span class="nonterminal">uIdentifier</span> | <span class="name">-</span> )
-</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
 <table class="grammar">
 <tbody class="grammar-ref" data-ref="prod-derivationExpression"></tbody>
 </table>
@@ -1335,7 +1158,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Derivation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Derivation</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasderivedfrom">Derivation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#derivation.id"><span class='attribute' id="derivation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -1488,7 +1311,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Agent maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Agent</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-agent">Agent</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.id"><span class='attribute' id="agent.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">identifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#agent.attributes"><span class='attribute' id="agent.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
@@ -1521,20 +1344,6 @@
 <section id="expression-attribution">
 <h4>Attribution</h4>
 
-<!--
-<div class="grammar">
-<span class="nonterminal">attributionExpression</span>&nbsp;::=  
-<span class="name">wasAttributedTo</span> 
-<span class="name">(</span> 
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span> 
-<span class="nonterminal">agIdentifier</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span> 
-</div>
--->
-
 
 <table class="grammar">
 
@@ -1546,7 +1355,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Attribution maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Attribution</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasattributedto">Attribution</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.id"><span class='attribute' id="attribution.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#attribution.entity"><span class='attribute' id="attribution.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-identifier">eIdentifier</a></code></td></tr>
@@ -1581,21 +1390,6 @@
 <section id="expression-Association">
 <h4>Association</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">associationExpression</span>&nbsp;::= 
-<span class="name">wasAssociatedWith</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">aIdentifier</span> 
-<span class="name">,</span> 
-( <span class="nonterminal">agIdentifier</span>  | <span class="name">-</span> )  (
-<span class="name">,</span> 
-( <span class="nonterminal">eIdentifier</span>  | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
 
 <table class="grammar">
 
@@ -1607,7 +1401,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Association maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Association</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasassociatedwith">Association</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#association.id"><span class='attribute' id="association.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -1665,21 +1459,6 @@
 <section id="expression-delegation">
 <h4>Delegation</h4>
 
-<!--
-<div class='grammar'>
-<span class="nonterminal">responsibilityExpression</span>&nbsp;::= 
-<span class="name">actedOnBehalfOf</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">;</span> </span>
-<span class="nonterminal">agIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">agIdentifier</span> (
-<span class="name">,</span>
-( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> ))?
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
 
 <table class="grammar">
 
@@ -1690,7 +1469,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Delegation maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Delegation</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-actedonbehalfof">Delegation</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#delegation.id"><span class='attribute' id="delegation.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -1746,7 +1525,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Influence maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Influence</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-wasinfluencedby">Influence</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class='attribute' id="influence.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
@@ -1797,6 +1576,24 @@
 
 <p>Bundles are self-contained: each identifier occuring in a bundle, including the bundle identifier itself, MUST be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix <code>p</code> within a bundle, there MUST be a namespace declaration for <code>p</code> in this bundled; for every identifier  without prefix, there MUST be a default namespace declaration  in this bundle.</p>
 
+
+<p>The following table summarizes how each constituent of a PROV-DM bundle maps to a PROV-N syntax element.</p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-bundle">Bundle</a></b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#bundle.constructor.id"><span class='attribute' id="bundle.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#bundle.constructor.descriptions"><span class='attribute' id="bundle.descriptions">descriptions</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-expression">expression</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#dfn-namespaceDeclaration"><span class='attribute' id="namespaceDeclaration">namespaceDeclaration</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code></td></tr>
+
+
+</table>
+</div>
+
+
 <div class="anexample">
     <pre class="codeexample">
 bundle ex:author-view
@@ -1853,7 +1650,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Alternate maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Alternate</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-alternateof">Alternate</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -1878,18 +1675,6 @@
 <h4>Specialization</h4>
 
 
-<!--
-<div class='grammar'>
-   <span class="nonterminal">specializationExpression</span>&nbsp;::=
-  <span class="name">specializationOf</span> 
-<span class="name">(</span> 
-<span class="nonterminal">eIdentifier</span> 
-<span class="name">,</span> 
-<span class="nonterminal">eIdentifier</span> 
-<span class="name">)</span>  
-</div>
--->
-
 <table class="grammar">
 
 <tbody class="grammar-ref" data-ref="prod-specializationExpression"></tbody>
@@ -1899,7 +1684,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Specialization maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Specialization</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-specializationof">Specialization</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -1943,7 +1728,7 @@
 <p>The following table summarizes how each constituent of a PROV-DM Mention maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Mention</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-mentionof">Mention</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
@@ -2008,15 +1793,13 @@
 <p>The following table summarizes how each constituent of a PROV-DM Membership maps to a PROV-N syntax element.</p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Membership</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b><a href="http://www.w3.org/TR/prov-dm/#dfn-hadmember">Membership</a></b></td><td><b>Non-Terminal</b></td></tr>
 <tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
 
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.collection"><span class='attribute' id="membership.collection">collection</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
 
 <tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.entity"><span class='attribute' id="membership.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
 </table>
 </div>
 
@@ -2045,63 +1828,6 @@
 
 
 
-<!--
-
-<section id="component6"> 
-<h3>Component 6: Annotations (OBSOLETE, TO DISAPPEAR)</h3>
-   <section id="expression-note"> 
-<h4>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>
-
-<div class="anexample">
-<pre class="codeexample">
-note(ann1; [ex:color="blue", ex:screenX=20, ex:screenY=30])
-</pre>
-</div>
-
-   </section> 
-
-<section id="expression-annotation">
-<h4>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>
-
-
-</section>
-
-
-
-
-</section>
-
--->
 
 <section  id="subexpressions">
 <h3>Further Expressions</h3>
@@ -2473,9 +2199,9 @@
 A <code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></code> consists of a namespace. Every qualified name without prefix in the scope of this declaration belongs to this namespace. Scope of a declaration is specified as follows:</p>
 <ul>
 <li> 
-The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> is the <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> itself;</li>
+The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> is the <code><a class="grammarRef" href="#prod-bundle">bundle</a></code> itself.</li>
 <li>
-the scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-document">document</a></code> is the <code><a class="grammarRef" href="#prod-document">document</a></code> itself, except the <code><a class="grammarRef" href="#prod-bundle">bundles</a></code> it may contain.</li>
+The scope of a namespace declaration directly occurring in a <code><a class="grammarRef" href="#prod-document">document</a></code> is the <code><a class="grammarRef" href="#prod-document">document</a></code> itself, exclunding the <code><a class="grammarRef" href="#prod-bundle">bundles</a></code> it may contain.</li>
 </ul>
 
 <p>A set of namespace declarations <code><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></code> MUST NOT re-declare the same prefix.</p>
@@ -2798,16 +2524,18 @@
 -->
 </div>
 
-<section class="appendix"> 
+<section class="appendix informative"> 
       <h2>Changes since last version</h2> 
       <p> 
 <ul>
 <p> <a href="http://www.w3.org/2011/prov/track/issues/543">ISSUE-543</a>: uses key-entity pair terminology for example 43.
 <p> <a href="http://www.w3.org/2011/prov/track/issues/538">ISSUE-538</a>: rephrasing of text in example 10.
+<p> <a href="http://www.w3.org/2011/prov/track/issues/547">ISSUE-547</a>: aligned terminology and productions with prov-constraints document, renaming 'toplevel bundle' to 'document', and renaming 'named bundle' to 'bundle'.
+<p> <a href="http://www.w3.org/2011/prov/track/issues/496">ISSUE-496</a>: For each prov-n term, added a cross-reference to corresponding prov-dm term (see table following each production). Rephrased text related to scope of a namespace declaration. Added an informative file with all productions.
 </ul>
 </section>
 
-<section class="appendix"> 
+<section class="appendix informative"> 
       <h2>Acknowledgements</h2> 
       <p>