--- a/model/working-copy/prov-asn.html Wed Feb 15 15:47:52 2012 +0000
+++ b/model/working-copy/prov-asn.html Wed Feb 15 16:15:10 2012 +0000
@@ -172,18 +172,6 @@
</section>
-<div class="buttonpanel">
-<form action="#"><p>
-<input id="hide-bnf" onclick="set_display_by_class('div','grammar','none'); set_display_by_id('hide-bnf','none'); set_display_by_id('show-bnf','');" type="button" value="Hide Grammar" />
-<input id="show-bnf" onclick="set_display_by_class('div','grammar',''); set_display_by_id('hide-bnf',''); set_display_by_id('show-bnf','none');" style="display: none" type="button"
-value="Show Grammar" />
-<input id="hide-asn" onclick="set_display_by_class('div','withAsn','none');set_display_by_class('span','withAsn','none'); set_display_by_id('hide-asn','none'); set_display_by_id('show-asn','');" type="button"
-value="Hide ASN" />
-<input id="show-asn" onclick="set_display_by_class('div','withAsn',''); set_display_by_class('span','withAsn',''); set_display_by_id('hide-asn',''); set_display_by_id('show-asn','none');" style="display: none"
-type="button" value="Show ASN" />
-</p>
-</form>
-</div>
@@ -557,7 +545,6 @@
-<div class="withAsn">
<p>A usage's text matches the <span class='nonterminal'>usageExpression</span> production.</p>
<div class='grammar'>
@@ -578,7 +565,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span><br/>
</div>
-</div>
+
<div class="anexample">
<pre class="codeexample">
@@ -599,7 +586,7 @@
<section id="expression-ActivityAssociation">
<h4>Activity Association</h4>
-<div class="withAsn">
+
<p>An activity association's text matches the <span class="nonterminal">activityAssociationExpression</span> productions of the grammar defined in this specification
document.</p>
@@ -616,13 +603,21 @@
</div>
</div>
+
+<div class="anexample">
+<pre class="codeexample">
+wasAssociatedWith(ex:pub2, w3:Consortium)
+wasAssociatedWith(ex:pub2, w3:Consortium @ pr:rec-advance)
+wasAssociatedWith(ex:pub2, w3:Consortium @ pr:rec-advance, [prov:role="funder"])
+</pre>
+
+
</section>
<section id="expression-Start-End">
<h4>Activity Start and End</h4>
-<div class="withAsn">
<p>Activity start and end texts match the <span class="nonterminal">startExpression</span> and <span class="nonterminal">endExpression</span> productions of the grammar defined in this
specification document.
</p>
@@ -646,7 +641,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
-</div>
+
</section>
@@ -676,6 +671,14 @@
<span class="name">)</span>
</div>
+<div class="anexample">
+<pre class="codeexample">
+actedOnBehalfOf(ag1,ag2)
+actedOnBehalfOf(ag1,ag2,a)
+actedOnBehalfOf(ag1,ag2,[prov:type="delegation"])
+actedOnBehalfOf(ag2,ag3,a,[prov:type="contract"])
+</pre>
+</div>
</section>
@@ -684,7 +687,6 @@
-<div class="withAsn">
<p>A derivation record's text matches the <span class='nonterminal'>derivationExpression</span> production.</p>
<div class='grammar'>
@@ -721,7 +723,17 @@
</p>
</div>
+<div class="anexample">
+<pre class="codeexample">
+wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasDerivedFrom(e2, e1, a, g2, u1)
+</pre>
+
+
+
+<!--
<p>In PROV-DM, the effective placeholder for an entity generation time is the <a>generation record</a>. The presence of
time information in imprecise derivation records is merely a convenience notation for a timeless derivation record and a generation record with this generation time information. </p>
@@ -734,6 +746,8 @@
<div class='pending'>Should derivation have a time? Which time? This is <a href="http://www.w3.org/2011/prov/track/issues/43">ISSUE-43</a>.<em>This is now addressed in this text. Optional time in derivation is generation time. See also <a href="http://www.w3.org/2011/prov/track/issues/205">ISSUE-205</a>.</em></div>
+-->
+
</section>
@@ -743,7 +757,6 @@
-<div class="withAsn">
<p>An alternate relation's text matches the <span class="nonterminal">alternateExpression</span> production.</p>
<div class='grammar'>
@@ -753,22 +766,13 @@
<span class="nonterminal">eIdentifier</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> <br/>
-|
- <span class="name">alternateOf</span>
-<span class="name">(</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">accIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">accIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
+<span class="name">)</span>
+</div>
+
+<div class="anexample">
+<pre class="codeexample">
+alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215)
+</pre>
</div>
@@ -781,24 +785,13 @@
<span class="nonterminal">eIdentifier</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> <br/>
-|
- <span class="name">specializationOf</span>
-<span class="name">(</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">accIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">accIdentifier</span>
-<span class="name">,</span>
- <span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span> <br/>
+<span class="name">)</span>
+</div>
-</div>
+<div class="anexample">
+<pre class="codeexample">
+specializationOf(tr:WD-prov-dm-20111215,tr:prov-dm)
+</pre>
</div>
@@ -830,6 +823,13 @@
</div>
</div>
+<div class="anexample">
+<pre class="codeexample">
+hasAnnotation(tr:WD-prov-dm-20111215,ex2:n1)
+</pre>
+</div>
+
+
</section>
</section>