--- a/model/prov-n.html Mon May 28 15:17:27 2012 +0100
+++ b/model/prov-n.html Mon May 28 15:27:49 2012 +0100
@@ -1344,7 +1344,7 @@
-<div class="anexample">
+<div class="anexample" id="anexample-derivation">
<pre class="codeexample">
wasDerivedFrom(d, e2, e1, a, g2, u1, [ex:comment="a righteous derivation"])
</pre>
@@ -1377,7 +1377,7 @@
<section id="expression-Revision">
<h4>Revision</h4>
-<div class="note">No longer a top level term, but just a subtype</div>
+
<!--
<div class="grammar">
@@ -1394,36 +1394,22 @@
<span class="name">)</span>
</div>
-->
-
+<!--
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-revisionExpression"></tbody>
</table>
+-->
<div class="anexample">
<pre class="codeexample">
-wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u, [ex:comment="??"] )
+wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:type="prov:WasRevisionOf", ex:comment="a righteous derivation"])
</pre>
-<p> Here
- <span class="name">rev1</span> is the optional revision identifier,
- <span class="name">tr:WD-prov-dm-20111215</span> is the identifier of the revised entity,
- <span class="name">tr:WD-prov-dm-20111018</span> is the identifier of the original entity,
- <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">tr:WD-prov-dm-20111215</span> and <span class="name">tr:WD-prov-dm-20111018</span>,
- <span class="name">ex:g</span> is the identifier for the generation involving the revised entity <span class="name">tr:WD-prov-dm-20111215</span> and activity <span class="name">ex:act1</span>;
- <span class="name">ex:u</span> is the identifier for the usage involving the used entity <span class="name">tr:WD-prov-dm-20111018</span> and activity <span class="name">ex:act1</span>,
- and <span class="name"> [ex:comment="??"]</span> are optional attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-
-
- <pre class="codeexample">
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u)
-wasRevisionOf(id; tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, , ex:act1, ex:g, ex:u)
-wasRevisionOf(id;tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [ex:comment="??"])
-</pre>
+<p>Here, the derivation from
+<a href="#anexample-derivation" class="anexample-ref"><span>Example REF</span></a>
+is extended with a <span class="name">prov:type</span> attribute and value <span class="name">prov:WasRevisionOf</span>.
</div>
@@ -1431,7 +1417,7 @@
<section id="expression-quotation">
<h4>Quotation</h4>
-<div class="note">No longer a top level term, but just a subtype</div>
+
<!--
<div class="grammar">
@@ -1451,16 +1437,24 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
--->
+
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-quotationExpression"></tbody>
</table>
-
-
-
+-->
+
+<div class="anexample">
+ <pre class="codeexample">
+wasDerivedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [ prov:type='prov:WasQuotedFrom' ])
+ </pre>
+
+<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:WasQuotedFrom</span>.
+</div>
+
+<!--
<div class="anexample">
<pre class="codeexample">
wasQuotedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [])
@@ -1484,14 +1478,14 @@
wasQuotedFrom(id; ex:blockQuote,ex:blog,ex:act1, -,-)
</pre>
</div>
-
+-->
</section> <!-- end quotation -->
<section id="expression-original-source">
<h4>Original Source</h4>
-<div class="note">No longer a top level term, but just a subtype</div>
+
<!--
<div class="grammar">
@@ -1505,16 +1499,24 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
--->
+
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></tbody>
</table>
-
-
-
+-->
+
+<div class="anexample">
+ <pre class="codeexample">
+wasDerivedFrom(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ prove:type='prov:HadOriginalSource' ])
+</pre>
+<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:HadOriginalSource</span>.
+ </pre>
+</div>
+
+<!--
<div class="anexample">
<pre class="codeexample">
hadOriginalSource(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ex:param="a"])
@@ -1536,6 +1538,7 @@
hadOriginalSource(id; ex:e1, ex:e2, ex:act, -, -, [ex:param="a"])
</pre>
</div>
+-->
</section> <!-- end original source -->
<section id="expression-trace">