--- a/model/prov-n.html	Tue Jul 10 14:41:41 2012 +0100
+++ b/model/prov-n.html	Tue Jul 10 15:00:50 2012 +0100
@@ -520,17 +520,14 @@
 <div class='grammar'>
  <code class="grammarRef">expr</code> &nbsp;::= <em>term</em>
 </div>
-
-
+<p>Symbols are written with an initial capital letter if they are the start symbol of a regular language, otherwise with an initial lowercase letter. 
 A production rule in the grammar defines a symbol 
- <code class="grammarRef"><code class="grammarRef">&lt;TERMINAL&gt;</code></code>  (<dfn>terminal symbol</dfn>)
+ <code class="grammarRef">&lt;TERMINAL&gt;</code>  (<dfn>terminal symbol</dfn>)
   using the following form:</p>
-
 <div class='grammar'>
  <code class="grammarRef">&lt;TERMINAL&gt;</code> &nbsp;::= <em>term</em>
 </div>
 
-<p>Symbols are written with an initial capital letter if they are the start symbol of a regular language, otherwise with an initial lowercase letter. </p>
 
 
 
@@ -2271,7 +2268,11 @@
 </div>
 
 
-<p><b>Note:</b>The productions for  <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and  <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> are conflicting.  In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a parser should give precedence to the production for <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
+<p><b>Note:</b>The productions for the terminals  <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and  <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> are conflicting.
+Indeed,  for a tokenizer operating independently of the parse tree, <code>abc</code> matches both 
+<code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and
+<code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
+  In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a tokenizer should give  preference to the production <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
 </p>
 
 
@@ -2352,11 +2353,10 @@
 <p> In particular, a Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>);  such IRI has no specific interpretation in the context of PROV.</p>
 
 
-<p><b>Note:</b>The productions for <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code> and
+<p><b>Note:</b>The productions for terminals <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and
 <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> are conflicting.  
-Indeed <code>1234</code> can be both a <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> and a <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code> (without prefix).  To resolve this conflict,
-in the context of the production
-<code class="content"><a class="grammarRef" href="#prod-literal">literal</a></code>, a parser SHOULD give precedence to the production for
+Indeed, for a tokenizer operating independently of the parse tree, <code>1234</code> matches both <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> and <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> (local name without prefix). In the context of
+a <code class="content"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation</a></code>, a tokenizer should give preference to the production
 <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code>. 
 </p>