--- a/model/working-copy/wd5-prov-n.html	Tue Mar 20 15:22:54 2012 +0000
+++ b/model/working-copy/wd5-prov-n.html	Wed Mar 21 09:21:57 2012 +0000
@@ -453,9 +453,9 @@
 <span class="name">(</span>
 <span class="nonterminal">identifier</span>
 <span class="optional"><span class="name">,</span>
-(<span class="nonterminal">time</span> | '-' )
+(<span class="nonterminal">time</span> | <span class="name">-</span> )
 <span class="name">,</span>
-(<span class="nonterminal">time</span> | '-' )</span>
+(<span class="nonterminal">time</span> | <span class="name">-</span> )</span>
 <span class="nonterminal">optional-attribute-values</span>
 <span class="name">)</span>
 </div>
@@ -487,16 +487,13 @@
 <span class="nonterminal">generationExpression</span>&nbsp;::=  
 <span class="name">wasGeneratedBy</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="nonterminal">optional-time</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/>
-<span class="nonterminal">optional-identifier</span>&nbsp;::=  <span class="optional"><span class="nonterminal">identifier</span> <span class="name">,</span></span><br/>
-<span class="nonterminal">optional-time</span>&nbsp;::= <span class="optional"><span class="name">,</span>
-<span class="nonterminal">time</span></span>
 </div>
 </div>
 
@@ -523,11 +520,11 @@
 <span class="nonterminal">usageExpression</span>&nbsp;::=  
 <span class="name">used</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="nonterminal">optional-time</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>
@@ -545,7 +542,7 @@
 
 </section>
 <section id="term-Start">
-<h4>Activity Start</h4>
+<h4>Start</h4>
 
 <p>An activity start's text matches the <span class="nonterminal">startExpression</span> production of the grammar
 </p>
@@ -555,11 +552,11 @@
 <span class="nonterminal">startExpression</span>&nbsp;::= 
 <span class="name">wasStartedBy</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="nonterminal">optional-time</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>
@@ -576,7 +573,7 @@
 </section>
 
 <section id="term-End">
-<h4>Activity End</h4>
+<h4>End</h4>
 
 <p>An activity  end's text matches the <span class="nonterminal">endExpression</span> production of the grammar.
 </p>
@@ -586,11 +583,11 @@
 <span class="nonterminal">endExpression</span>&nbsp;::= 
 <span class="name">wasEndedBy</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="nonterminal">optional-time</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>
@@ -607,14 +604,14 @@
 </section>
 
 <section id="term-wasInformedBy">
-<h4>Information Flow Ordering</h4>
+<h4>Communication</h4>
 
 
 <div class="grammar">
-<span class="nonterminal">informationFlowOrderingExpression</span> &nbsp;::= 
+<span class="nonterminal">communicationExpression</span> &nbsp;::= 
 <span class="name">wasInformedBy</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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>
@@ -629,14 +626,14 @@
 </div>
 </section>
 
-<section id="term-wasStartedByActivity">
-<h4>Control Flow Ordering</h4>
+<section id="term-startByActivity">
+<h4>Start by Activity</h4>
 
 <div class="grammar">
-<span class="nonterminal">controlOrderingExpression</span> &nbsp;::= 
+<span class="nonterminal">startByActivityExpression</span> &nbsp;::= 
 <span class="name">wasStartedByActivity</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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>
@@ -691,7 +688,7 @@
 <span class="nonterminal">attributionExpression</span>&nbsp;::=  
 <span class="name">wasAttributedTo</span> 
 <span class="name">(</span> 
-<span class="nonterminal">optional-identifier</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>
@@ -720,10 +717,12 @@
 <span class="nonterminal">activityAssociationExpression</span>&nbsp;::= 
 <span class="name">wasAssociatedWith</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</span>
-<span class="nonterminal">aIdentifier</span>,
-<span class="nonterminal">agIdentifier</span>
-<span class="optional">,<span class="nonterminal">eIdentifier</span></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>
@@ -746,12 +745,12 @@
 <span class="nonterminal">responsibilityExpression</span>&nbsp;::= 
 <span class="name">actedOnBehalfOf</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="optional"><span class="nonterminal">aIdentifier</span></span>
+( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> )
 <span class="nonterminal">optional-attribute-values</span>
 <span class="name">)</span>
 </div>
@@ -779,16 +778,18 @@
 <span class="nonterminal">derivationExpression</span>&nbsp;::= 
 <span class="name">wasDerivedFrom</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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="name">,</span>
-<span class="nonterminal">aIdentifier</span>
+<span class="optional">
 <span class="name">,</span>
-<span class="nonterminal">gIdentifier</span>
+( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> )
 <span class="name">,</span>
-<span class="nonterminal">uIdentifier</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>
@@ -809,12 +810,12 @@
 <span class="nonterminal">revisionExpression</span>&nbsp;::= 
 <span class="name">wasRevisionOf</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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">agIdentifier</span> | '-' )</span>
+<span class="name">,</span>
+( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
 <span class="nonterminal">optional-attribute-values</span>
 <span class="name">)</span>
 </div>
@@ -841,14 +842,16 @@
 <span class="nonterminal">quotationExpression</span>&nbsp;::=  
 <span class="name">wasQuotedFrom</span> 
 <span class="name">(</span> 
-<span class="nonterminal">optional-identifier</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">agIdentifier</span>
+( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
 <span class="name">,</span> 
-<span class="nonterminal">agIdentifier</span>
+( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
+</span>
 <span class="nonterminal">optional-attribute-values</span>
 <span class="name">)</span> 
 </div>
@@ -875,7 +878,7 @@
 <span class="nonterminal">originalSourceExpression</span>&nbsp;::=  
 <span class="name">hadOriginalSource</span> 
 <span class="name">(</span> 
-<span class="nonterminal">optional-identifier</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>
@@ -902,7 +905,7 @@
 <span class="nonterminal">traceabilityExpression</span>&nbsp;::= 
 <span class="name">tracedTo</span>
 <span class="name">(</span>
-<span class="nonterminal">optional-identifier</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>
@@ -973,6 +976,8 @@
 <section id="component5"> 
 <h3>Component 5: Collections</h3>
 
+<div class="note">To be checked: Grammar has not been implemented yet.</div>
+
 <section id="term-collection-insertion">
 <h3>Insertion</h3>
 
@@ -1221,8 +1226,6 @@
 </div>
 
    </section> 
-<section id="term-annotation">
-<h4>Annotation</h4>
 
 <section id="expression-annotation">
 <h4>Annotation</h4>
@@ -1249,7 +1252,7 @@
 </pre>
 </div>
 
-</section>
+
 </section>
 <section  id="second-class-elements">
 <section id="term-NamespaceDeclaration">