merge
authorPaolo Missier <pmissier@acm.org>
Thu, 12 Jul 2012 13:01:22 +0100
changeset 4013 66ba04e72046
parent 4012 6ffd88fda04d (current diff)
parent 4011 3f0c1f8c2f3b (diff)
child 4016 f6ac3b5612d5
merge
model/prov-n.html
--- a/model/prov-n.html	Thu Jul 12 13:01:00 2012 +0100
+++ b/model/prov-n.html	Thu Jul 12 13:01:22 2012 +0100
@@ -1973,35 +1973,17 @@
 <section id="component6"> 
 <h3>Component 6: Collections</h3>
 
-<!--  In the productions in this section, nonterminals  <a href="#prod-keyEntitySet">keyEntitySet</span> and <span class="nonterminal">keySet</span> are defined as follows.  -->
-
-<!--
-<div class="grammar">
-<span class="nonterminal">keyValuePairs</span> &nbsp;::= 
-<span class="name">(</span>
-    <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">eidentifier</span>
-    <span class="name">)</span>
-|
-<span class="name">(</span>
-  <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">eidentifier</span>
-<span class="name">)</span>
-  <span class="name">,</span>
-<span class="nonterminal">keyValuePairs</span>
-</div>
-
-  <div class="grammar">
-<span class="nonterminal">keySet</span> &nbsp;::= 
-    <span class="nonterminal">literal</span>
-|
-  <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">keySet</span>
-</div>
--->
+
+<section id="expression-collection">
+<h3>Collection</h3>
+
+
+<p>
+PROV-N provides no dedicated syntax for Collection and EmptyCollection. Instead, a Collection or an EmptyCollection MUST be expressed as an
+<code class="content"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></code> with attribute 
+<span  id="provn-type-Collection"><code>prov:type='prov:Collection'</code></span>, or
+<span  id="provn-type-EmptyCollection"><code>prov:type='prov:EmptyCollection'</code></span>.</p>
+</section>
 
 
 <section id="expression-collection-membership">
--- a/model/prov-table.html	Thu Jul 12 13:01:00 2012 +0100
+++ b/model/prov-table.html	Thu Jul 12 13:01:22 2012 +0100
@@ -692,14 +692,14 @@
 <tr class="component6-color">
 <td><a title="Collection">provdm:Collection</a></td>
 <td><a href="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/last-call/2012-07-03-internal-review/Overview.html#Collection">provo:Collection</a></td>
-<td></td>
+<td>type <code><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120629/prov-n.html#provn-type-Collection">Collection</a></code></td>
 <td  rowspan="3"><a href="#component6">Component 6: <br> Collections</a></td>
 </tr>
 
 <tr class="component6-color">
 <td><a title="EmptyCollection">provdm:EmptyCollection</a></td>
 <td><a href="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/last-call/2012-07-03-internal-review/Overview.html#EmptyCollection">provo:EmptyCollection</a></td>
-<td></td>
+<td>type <code><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/releases/ED-prov-n-20120629/prov-n.html#provn-type-EmptyCollection">EmptyCollection</a></code></td>
 </tr>
 
 <tr class="component6-color">