--- a/model/prov-n.html Wed May 16 18:58:13 2012 +0200
+++ b/model/prov-n.html Wed May 16 18:56:34 2012 +0100
@@ -324,7 +324,7 @@
<ul>
<li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal
<a class="grammarRef" href="#prod-bundle">bundle</a>.</li>
-<li>Readers of the [[PROV-DM]] and of [[PROV-CONSTRAINTS]] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the <a href="#grammar-notation">expression</a> nonterminal a useful entry point into the grammar.</li>
+<li>Readers of the [[PROV-DM]] and of [[PROV-CONSTRAINTS]] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the <a class="grammarRef" href="#prod-expression">expression</a> nonterminal a useful entry point into the grammar.</li>
</ul>
</section>
@@ -455,7 +455,7 @@
</ul>
</div>
-The grammar is centered on nonterminals for various types of <span class="nonterminal">expression</span>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level
+The grammar is centered on nonterminals for various types of <a class="grammarRef" href="#prod-expression">expression</a>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level
<a class="grammarRef" href="#prod-bundle">bundle</a> nonterminal as a starting point instead.
@@ -518,8 +518,8 @@
</table>
-Each expression non-terminal <span class="nonterminal">expression</span>, i.e., <span class="nonterminal">entityExpression</span>, <span class="nonterminal">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
-<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <a>toplevel bundle</a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
+Each expression non-terminal <a class="grammarRef" href="#prod-expression">expression</a>, i.e., <a class="grammarRef" href="#prod-entityExpression">entityExpression</a>, <a class="grammarRef" href="#prod-activityExpression">activityExpression</a> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
+<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in a <a class="grammarRef" href="#prod-bundle">toplevel bundle</a> with some namespace declarations, such that the text for an element matches the corresponding <a class="grammarRef" href="#prod-expression">expression</a> production of the grammar.
</section>
@@ -773,7 +773,7 @@
</pre>
</div>
-<p>Even though the production <span class="nonterminal">generationExpression</span> allows for expressions <span class="name">wasGeneratedBy(e2, -, -)</span> and <span class="name">wasGeneratedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N, since
+<p>Even though the production <a class="grammarRef" href="#prod-generationExpression">generationExpression</a> allows for expressions <span class="name">wasGeneratedBy(e2, -, -)</span> and <span class="name">wasGeneratedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N, since
at least one of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, or <span class='attribute'>attributes</span> MUST be present.</p>
@@ -784,6 +784,7 @@
<section id="expression-Usage">
<h4>Usage</h4>
+<!--
<div class='grammar'>
<span class="nonterminal">usageExpression</span> ::=
<span class="name">used</span>
@@ -796,6 +797,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span><br/>
</div>
+-->
<table class="grammar">
@@ -874,7 +876,7 @@
</pre>
</div>
-<p><strong>Note:</strong> Even though the production <span class="nonterminal">startExpression</span> allows for expressions <span class="name">wasStartedBy(e2, -, -)</span> and <span class="name">wasStartedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N,
+<p><strong>Note:</strong> Even though the production <a class="grammarRef" href="#prod-startExpression">startExpression</a> 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 <span class='attribute'>trigger</span>, <span class='attribute'>time</span>, or <span class='attribute'>attributes</span> MUST be present.</p>
@@ -926,7 +928,7 @@
</pre>
</div>
-<p><strong>Note:</strong>Even though the production <span class="nonterminal">endExpression</span> allows for expressions <span class="name">wasEndedBy(e2, -, -)</span> and <span class="name">wasEndedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N,
+<p><strong>Note:</strong>Even though the production <a class="grammarRef" href="#prod-endExpression"</a> 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 <span class='attribute'>trigger</span>, <span class='attribute'>time</span>, and <span class='attribute'>attributes</span> MUST be present.</p>
</section>
@@ -977,7 +979,7 @@
</pre>
</div>
-<p>Even though the production <span class="nonterminal">invalidationExpression</span> 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
+<p>Even though the production <a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a> 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
at least one of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, or <span class='attribute'>attributes</span> MUST be present.</p>
@@ -1198,7 +1200,7 @@
</pre>
</div>
-<p><strong>Note:</strong>The production <span class="nonterminal">associationExpression</span> allows for expressions <span class="name">wasAssociatedWith(a, -, -)</span> and <span class="name">wasAssociatiedWith(-, a, -, -)</span>. However, these expressions are not valid in PROV-N,
+<p><strong>Note:</strong>The production <a class="grammarRef" href="#prod-associationExpression">associationExpression</a> allows for expressions <span class="name">wasAssociatedWith(a, -, -)</span> and <span class="name">wasAssociatiedWith(-, a, -, -)</span>. However, these expressions are not valid in PROV-N,
because at least one of <span class='attribute'>agent</span> or <span class='attribute'>plan</span> MUST be present.</p>
</section>
@@ -1645,8 +1647,7 @@
<section id="component6">
<h3>Component 6: Collections</h3>
-
-In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
+<!-- In the productions in this section, nonterminals <a href="#prod-keyEntitySet">keyEntitySet</span> and <span class="nonterminal">keySet</span> are defined as follows. -->
<!--
<div class="grammar">
@@ -1974,7 +1975,7 @@
-->
-<p>A PROV qualified name <a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a> has a more permissive syntax then XML's <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a> [[!XML-NAMES]]
+<p>A PROV qualified name <a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a> has a more permissive syntax then XML's <a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a> [[!XML-NAMES]]
and SPARQL <a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#rPrefixedName">PrefixedName</a> [[!RDF-SPARQL-QUERY]]. It is a PROV requirement that the concatenation of the namespace with the local part results in a valid IRI [[!IRI]]. Given that
',' (comma),
';' (semi-colon),
@@ -2050,7 +2051,7 @@
</div>
-<p><b>Note:</b>The productions for <span class="nonterminal">qualifiedName</span> and <span class="nonterminal">prefix</span> are conflicting. In the context of a <span class="nonterminal">namespaceDeclaration</span>, a parser should give precedence to the production for <span class="nonterminal">prefix</span>.
+<p><b>Note:</b>The productions for <a class="grammarRef" href="#prod-QUALIFIED_NAME">qualifiedName</a> and <a class="grammarRef" href="#http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a> are conflicting. In the context of a <a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a>, a parser should give precedence to the production for <a class="grammarRef" href="#http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">prefix</a>.
</p>