--- a/model/prov-n.html	Thu Jun 28 23:44:48 2012 +0100
+++ b/model/prov-n.html	Thu Jun 28 23:53:15 2012 +0100
@@ -2164,59 +2164,32 @@
 This section defines further expressions of PROV-N.
 
 
-<section id="expression-NamespaceDeclaration">
-<h3>Namespace Declaration</h3>
-
-<!--
-<div class='grammar'>
-<span class="nonterminal">namespaceDeclarations</span>&nbsp;::=  
- |  <span class="group"><span class="nonterminal">defaultNamespaceDeclaration</span> | <span class="nonterminal">namespaceDeclaration</span></span> <span class="star"> <span
-class="nonterminal">namespaceDeclaration</span></span><br>
-<span class="nonterminal">namespaceDeclaration</span>&nbsp;::=  
-<span class="name">prefix</span> <span class="nonterminal">prefix</span> <span class="nonterminal">IRI</span><br/>
-<span class="nonterminal">defaultNamespaceDeclaration</span>&nbsp;::=  
- <span class="name">default</span> <span class="nonterminal">IRI</span> <br/>
-</div>
--->
-
-<table class="grammar">
-
-<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"></tbody>
-<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"></tbody>
-<tbody class="grammar-ref" data-ref="prod-namespace"></tbody>
-<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"></tbody>
-
-</table>
-
-
-<p>In PROV-N, the following prefixes are reserved:
-<ul>
-<li>  <span class="name">prov</span>  denotes the PROV namespace with URI <span class="name">http://www.w3.org/ns/prov#</span></li>
-<li>  <span class="name">xsd</span> denotes the XML Schema namespace with URI  <span class="name">http://www.w3.org/2001/XMLSchema#</span>.
-</li>
-</ul>
-<p>A PROV-N document MUST NOT redeclare prefixes <span class="name">prov</span> and <span class="name">xsd</span>.</p>
-
-<div class="anexample" id="anexample-namespace">
-<p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
-<pre class="codeexample">
-bundle
-  default &lt;http://example.org/0/&gt;
-  prefix ex1 &lt;http://example.org/1/&gt;
-  prefix ex2 &lt;http://example.org/2/&gt;
-...
-endBundle
-</pre>
-</div>
-
-
-
-</section>
 
 
 <section id="expression-identifier">
 <h4>Identifier</h4>
 
+<p>Various kinds of identifiers are used in productions.</p>
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-eIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-cIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-dIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-bIdentifier"></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifier"></tbody>
+</table>
+
+
 <p>
 A <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
 The PROV data model  stipulates that a qualified name can be mapped into an IRI
@@ -2260,22 +2233,6 @@
 
  
 <table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-eIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-cIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-dIdentifier"></tbody>
-<tbody class="grammar-ref" data-ref="prod-bIdentifier"></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"></tbody>
-<tbody class="grammar-ref" data-ref="prod-identifier"></tbody>
-
 <tbody class="grammar-ref" data-ref="prod-QUALIFIED_NAME"></tbody>
 <tbody class="grammar-ref" data-ref="prod-PN_LOCAL"></tbody>
 <tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"></tbody>
@@ -2494,6 +2451,54 @@
 
 
 
+<section id="expression-NamespaceDeclaration">
+<h3>Namespace Declaration</h3>
+
+<!--
+<div class='grammar'>
+<span class="nonterminal">namespaceDeclarations</span>&nbsp;::=  
+ |  <span class="group"><span class="nonterminal">defaultNamespaceDeclaration</span> | <span class="nonterminal">namespaceDeclaration</span></span> <span class="star"> <span
+class="nonterminal">namespaceDeclaration</span></span><br>
+<span class="nonterminal">namespaceDeclaration</span>&nbsp;::=  
+<span class="name">prefix</span> <span class="nonterminal">prefix</span> <span class="nonterminal">IRI</span><br/>
+<span class="nonterminal">defaultNamespaceDeclaration</span>&nbsp;::=  
+ <span class="name">default</span> <span class="nonterminal">IRI</span> <br/>
+</div>
+-->
+
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"></tbody>
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"></tbody>
+<tbody class="grammar-ref" data-ref="prod-namespace"></tbody>
+<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"></tbody>
+
+</table>
+
+
+<p>In PROV-N, the following prefixes are reserved:
+<ul>
+<li>  <span class="name">prov</span>  denotes the PROV namespace with URI <span class="name">http://www.w3.org/ns/prov#</span></li>
+<li>  <span class="name">xsd</span> denotes the XML Schema namespace with URI  <span class="name">http://www.w3.org/2001/XMLSchema#</span>.
+</li>
+</ul>
+<p>A PROV-N document MUST NOT redeclare prefixes <span class="name">prov</span> and <span class="name">xsd</span>.</p>
+
+<div class="anexample" id="anexample-namespace">
+<p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
+<pre class="codeexample">
+bundle
+  default &lt;http://example.org/0/&gt;
+  prefix ex1 &lt;http://example.org/1/&gt;
+  prefix ex2 &lt;http://example.org/2/&gt;
+...
+endBundle
+</pre>
+</div>
+
+
+
+</section>