Further improvements to RDF expression and HTML output
authorMo McRoberts <mo.mcroberts@bbc.co.uk>
Mon, 09 Sep 2013 21:39:07 +0100
changeset 21 c8b4f86a87ad
parent 20 7eb74bbe9931
child 22 428d0d0f20a1
Further improvements to RDF expression and HTML output
2/Makefile
2/ODRL20.html
2/ODRL20.nt
2/ODRL20.rdf
2/ODRL20.ttl
2/ODRL20.var
2/template.phtml
classes.php
--- a/2/Makefile	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/Makefile	Mon Sep 09 21:39:07 2013 +0100
@@ -17,5 +17,5 @@
 %.nt: %.ttl
 	$(RAPPER) -i turtle -o ntriples $< > [email protected]
 
-ODRL20.html: ODRL20.ttl ../phpspecgen.php ../classes.php
+ODRL20.html: ODRL20.ttl ../phpspecgen.php ../classes.php template.phtml
 	php -f ../phpspecgen.php $< '$(NSURI)' > [email protected]
--- a/2/ODRL20.html	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/ODRL20.html	Mon Sep 09 21:39:07 2013 +0100
@@ -5,6 +5,10 @@
     <title>Open Digital Rights Language (ODRL)</title>
 	<link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/w3c-unofficial">
 	<link rel="stylesheet" type="text/css" href="local.css">
+	<link rel="alternate" type="text/turtle" href="ODRL20.ttl">
+	<link rel="alternate" type="application/rdf+xml" href="ODRL20.rdf">
+	<link rel="alternate" type="application/xml" href="ODRL20.xsd">
+	<link rel="alternate" type="text/plain" href="ODRL20.nt">
 </head>
 <body>
     <div class="container">
@@ -26,6 +30,7 @@
   <tr><th>URI:</th> <td><a href="http://www.w3.org/ns/odrl/2/Asset">http://www.w3.org/ns/odrl/2/Asset</a></td></tr>
 <tr><th>Label:</th> <td>Asset</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
+<tr><th>In range of:</th> <td><a href="#term-relation">relation</a>, <a href="#term-output">output</a>, <a href="#term-target">target</a></td></tr>
 </table>
 </div>
 <h3 id="term-Party">Party</h3
@@ -35,6 +40,7 @@
 <tr><th>Label:</th> <td>Party</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Properties:</th> <td><a href="#term-scope">scope</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-function">function</a>, <a href="#term-assignee">assignee</a>, <a href="#term-assigner">assigner</a></td></tr>
 </table>
 </div>
 <h3 id="term-Scope">Scope</h3
@@ -44,6 +50,7 @@
 <tr><th>Label:</th> <td>Scope</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent class:</th> <td><a href="http://www.w3.org/2004/02/skos/core#Concept">skos:Concept</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-scope">scope</a></td></tr>
 <tr><th>Instances:</th> <td><a href="#term-all">all</a>, <a href="#term-all2ndConnections">all2ndConnections</a>, <a href="#term-allConnections">allConnections</a>, <a href="#term-allGroups">allGroups</a>, <a href="#term-group">group</a>, <a href="#term-individual">individual</a></td></tr>
 </table>
 </div>
@@ -56,6 +63,7 @@
 <tr><th>Subclasses:</th> <td><a href="#term-Agreement">Agreement</a>, <a href="#term-Offer">Offer</a>, <a href="#term-Privacy">Privacy</a>, <a href="#term-Request">Request</a>, <a href="#term-Set">Set</a>, <a href="#term-Ticket">Ticket</a></td></tr>
 <tr><th>Parent class:</th> <td><a href="http://www.w3.org/2002/07/owl#Thing">owl:Thing</a></td></tr>
 <tr><th>Properties:</th> <td><a href="#term-conflict">conflict</a>, <a href="#term-undefined">undefined</a>, <a href="#term-permission">permission</a>, <a href="#term-prohibition">prohibition</a>, <a href="#term-inheritAllowed">inheritAllowed</a>, <a href="#term-inheritFrom">inheritFrom</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-inheritFrom">inheritFrom</a></td></tr>
 </table>
 </div>
 <h3 id="term-ConflictTerm">ConflictTerm</h3
@@ -64,6 +72,7 @@
   <tr><th>URI:</th> <td><a href="http://www.w3.org/ns/odrl/2/ConflictTerm">http://www.w3.org/ns/odrl/2/ConflictTerm</a></td></tr>
 <tr><th>Label:</th> <td>Conflict term</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
+<tr><th>In range of:</th> <td><a href="#term-conflict">conflict</a></td></tr>
 <tr><th>Instances:</th> <td><a href="#term-perm">perm</a>, <a href="#term-prohibit">prohibit</a>, <a href="#term-invalid">invalid</a></td></tr>
 </table>
 </div>
@@ -73,6 +82,7 @@
   <tr><th>URI:</th> <td><a href="http://www.w3.org/ns/odrl/2/UndefinedTerm">http://www.w3.org/ns/odrl/2/UndefinedTerm</a></td></tr>
 <tr><th>Label:</th> <td>Undefined values</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
+<tr><th>In range of:</th> <td><a href="#term-undefined">undefined</a></td></tr>
 <tr><th>Instances:</th> <td><a href="#term-ignore">ignore</a>, <a href="#term-invalid">invalid</a>, <a href="#term-support">support</a></td></tr>
 </table>
 </div>
@@ -125,6 +135,7 @@
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent class:</th> <td><a href="http://www.w3.org/2004/02/skos/core#Concept">skos:Concept</a></td></tr>
 <tr><th>Properties:</th> <td><a href="#term-relation">relation</a>, <a href="#term-output">output</a>, <a href="#term-target">target</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-action">action</a></td></tr>
 <tr><th>Instances:</th> <td><a href="#term-acceptTracking">acceptTracking</a>, <a href="#term-adHocShare">adHocShare</a>, <a href="#term-aggregate">aggregate</a>, <a href="#term-annotate">annotate</a>, <a href="#term-anonymize">anonymize</a>, <a href="#term-append">append</a>, <a href="#term-archive">archive</a>, <a href="#term-attachPolicy">attachPolicy</a>, <a href="#term-attachSource">attachSource</a>, <a href="#term-attribute">attribute</a>, <a href="#term-commercialize">commercialize</a>, <a href="#term-concurrentUse">concurrentUse</a>, <a href="#term-copy">copy</a>, <a href="#term-delete">delete</a>, <a href="#term-derive">derive</a>, <a href="#term-display">display</a>, <a href="#term-distribute">distribute</a>, <a href="#term-ensureExclusivity">ensureExclusivity</a>, <a href="#term-execute">execute</a>, <a href="#term-export">export</a>, <a href="#term-extract">extract</a>, <a href="#term-extractChar">extractChar</a>, <a href="#term-extractPage">extractPage</a>, <a href="#term-extractWord">extractWord</a>, <a href="#term-give">give</a>, <a href="#term-include">include</a>, <a href="#term-index">index</a>, <a href="#term-inform">inform</a>, <a href="#term-install">install</a>, <a href="#term-lease">lease</a>, <a href="#term-license">license</a>, <a href="#term-lend">lend</a>, <a href="#term-modify">modify</a>, <a href="#term-move">move</a>, <a href="#term-nextPolicy">nextPolicy</a>, <a href="#term-obtainConsent">obtainConsent</a>, <a href="#term-pay">pay</a>, <a href="#term-play">play</a>, <a href="#term-present">present</a>, <a href="#term-preview">preview</a>, <a href="#term-print">print</a>, <a href="#term-read">read</a>, <a href="#term-reproduce">reproduce</a>, <a href="#term-reviewPolicy">reviewPolicy</a>, <a href="#term-secondaryUse">secondaryUse</a>, <a href="#term-sell">sell</a>, <a href="#term-share">share</a>, <a href="#term-shareAlike">shareAlike</a>, <a href="#term-textToSpeech">textToSpeech</a>, <a href="#term-transform">transform</a>, <a href="#term-translate">translate</a>, <a href="#term-uninstall">uninstall</a>, <a href="#term-watermark">watermark</a>, <a href="#term-write">write</a></td></tr>
 </table>
 </div>
@@ -136,6 +147,7 @@
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent class:</th> <td><a href="http://www.w3.org/2002/07/owl#Thing">owl:Thing</a></td></tr>
 <tr><th>Properties:</th> <td><a href="#term-unit">unit</a>, <a href="#term-operator">operator</a>, <a href="#term-rightOperand">rightOperand</a>, <a href="#term-status">status</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-constraint">constraint</a></td></tr>
 </table>
 </div>
 <h3 id="term-Operator">Operator</h3
@@ -145,6 +157,7 @@
 <tr><th>Label:</th> <td>Operator</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent class:</th> <td><a href="http://www.w3.org/2002/07/owl#Thing">owl:Thing</a></td></tr>
+<tr><th>In range of:</th> <td><a href="#term-operator">operator</a></td></tr>
 <tr><th>Instances:</th> <td><a href="#term-eq">eq</a>, <a href="#term-gt">gt</a>, <a href="#term-gteq">gteq</a>, <a href="#term-hasPart">hasPart</a>, <a href="#term-isA">isA</a>, <a href="#term-isAllOf">isAllOf</a>, <a href="#term-isAnyOf">isAnyOf</a>, <a href="#term-isNoneOf">isNoneOf</a>, <a href="#term-isPartOf">isPartOf</a>, <a href="#term-lt">lt</a>, <a href="#term-lteq">lteq</a>, <a href="#term-neq">neq</a></td></tr>
 </table>
 </div>
@@ -428,7 +441,7 @@
 <tr><th>Label:</th> <td>date/time</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent property:</th> <td><a href="#term-rightOperand">rightOperand</a></td></tr>
-<tr><th>Range:</th> <td><a href="#term-genid1">genid1</a></td></tr>
+<tr><th>Range:</th> <td><a href="http://www.w3.org/2001/XMLSchema#date">xsd:date</a>, <a href="http://www.w3.org/2001/XMLSchema#dateTime">xsd:dateTime</a></td></tr>
 </table>
 </div>
 <h3 id="term-deliveryChannel">deliveryChannel</h3
@@ -531,7 +544,7 @@
 <tr><th>Label:</th> <td>percentage</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent property:</th> <td><a href="#term-rightOperand">rightOperand</a></td></tr>
-<tr><th>Range:</th> <td><a href="http://www.w3.org/2000/01/rdf-schema#Literal">rdfs:Literal</a></td></tr>
+<tr><th>Range:</th> <td><a href="http://www.w3.org/2001/XMLSchema#decimal">xsd:decimal</a></td></tr>
 </table>
 </div>
 <h3 id="term-product">product</h3
@@ -541,6 +554,7 @@
 <tr><th>Label:</th> <td>product</td></tr>
 <tr><th>Status:</th> <td>testing</td></tr>
 <tr><th>Parent property:</th> <td><a href="#term-rightOperand">rightOperand</a></td></tr>
+<tr><th>Range:</th> <td><a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a></td></tr>
 </table>
 </div>
 <h3 id="term-proximity">proximity</h3
@@ -737,7 +751,7 @@
 </div>
 <h2 id="sec-concepts">Concepts</h2>
 <h3 id="term-acceptTracking">acceptTracking</h3
-<p>The act of accepting that the use of the asset may be recorded.</p>
+<p>The act of accepting that the use of the asset may be recorded. The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'.</p>
 <table>
   <tr><th>URI:</th> <td><a href="http://www.w3.org/ns/odrl/2/acceptTracking">http://www.w3.org/ns/odrl/2/acceptTracking</a></td></tr>
 <tr><th>Label:</th> <td>Accept tracking</td></tr>
@@ -747,7 +761,7 @@
 </table>
 </div>
 <h3 id="term-adHocShare">adHocShare</h3
-<p>The act of sharing the asset to parties in close proximity to the owner.</p>
+<p>The act of sharing the asset to parties in close proximity to the owner. This action may be used to express [OMA] Sharing semantics.</p>
 <table>
   <tr><th>URI:</th> <td><a href="http://www.w3.org/ns/odrl/2/adHocShare">http://www.w3.org/ns/odrl/2/adHocShare</a></td></tr>
 <tr><th>Label:</th> <td>Ad-hoc sharing</td></tr>
--- a/2/ODRL20.nt	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/ODRL20.nt	Mon Sep 09 21:39:07 2013 +0100
@@ -186,6 +186,12 @@
 <http://www.w3.org/ns/odrl/2/undefined> <http://www.w3.org/2000/01/rdf-schema#comment> "Relates the mechanism used for handling undefined actions to a Policy. If no mechanism is specified, the default is invalid."@en .
 <http://www.w3.org/ns/odrl/2/undefined> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Policy> .
 <http://www.w3.org/ns/odrl/2/undefined> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/UndefinedTerm> .
+_:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Action> .
+_:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Permission> .
+_:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid1 .
+_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+_:genid3 <http://www.w3.org/2002/07/owl#unionOf> _:genid2 .
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -193,8 +199,13 @@
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#label> "permission"@en .
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#comment> "Relates the description of an individual Permission to a Policy. A permission can be specified either in terms of an Action alone, or an instance of Permission relating an Action and one or more other attributes."@en .
 <http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Policy> .
-<http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Permission> .
-<http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Action> .
+<http://www.w3.org/ns/odrl/2/permission> <http://www.w3.org/2000/01/rdf-schema#range> _:genid3 .
+_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Action> .
+_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:genid5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Prohibition> .
+_:genid5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid4 .
+_:genid6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+_:genid6 <http://www.w3.org/2002/07/owl#unionOf> _:genid5 .
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -202,8 +213,7 @@
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#label> "prohibition"@en .
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#comment> "Relates the description of an individual Prohibition to a Policy. A prohibition can be specified either in terms of an Action alone, or an instance of Prohibition relating an Action and one or more other attributes."@en .
 <http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Policy> .
-<http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Prohibition> .
-<http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Action> .
+<http://www.w3.org/ns/odrl/2/prohibition> <http://www.w3.org/2000/01/rdf-schema#range> _:genid6 .
 <http://www.w3.org/ns/odrl/2/inheritAllowed> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/inheritAllowed> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> .
 <http://www.w3.org/ns/odrl/2/inheritAllowed> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -299,7 +309,6 @@
 <http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2000/01/rdf-schema#label> "function"@en .
 <http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2000/01/rdf-schema#comment> "Function is an abstract property whose sub-properties define the roles which may be fulfilled by a party in relation to a Rule."@en .
-<http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2004/02/skos/core#scopeNote> ""@en .
 <http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Rule> .
 <http://www.w3.org/ns/odrl/2/function> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Party> .
 <http://www.w3.org/ns/odrl/2/action> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
@@ -318,6 +327,12 @@
 <http://www.w3.org/ns/odrl/2/constraint> <http://www.w3.org/2000/01/rdf-schema#comment> "One or more constraints which affect the validity of the Permission; e.g. if the Action play is only permitted for a certain period of time."@en .
 <http://www.w3.org/ns/odrl/2/constraint> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Rule> .
 <http://www.w3.org/ns/odrl/2/constraint> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Constraint> .
+_:genid7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Action> .
+_:genid7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:genid8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/ns/odrl/2/Duty> .
+_:genid8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid7 .
+_:genid9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+_:genid9 <http://www.w3.org/2002/07/owl#unionOf> _:genid8 .
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -325,8 +340,7 @@
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#label> "duty"@en .
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#comment> "A Duty indicates requirements which must be fulfilled in order to receive the permission."@en .
 <http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#domain> <http://www.w3.org/ns/odrl/2/Permission> .
-<http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Duty> .
-<http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/ns/odrl/2/Action> .
+<http://www.w3.org/ns/odrl/2/duty> <http://www.w3.org/2000/01/rdf-schema#range> _:genid9 .
 <http://www.w3.org/ns/odrl/2/unit> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/unit> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/unit> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
@@ -372,81 +386,68 @@
 <http://www.w3.org/ns/odrl/2/gt> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/gt> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/gt> <http://www.w3.org/2000/01/rdf-schema#label> "Greater than"@en .
-<http://www.w3.org/ns/odrl/2/gt> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/2000/01/rdf-schema#label> "Greater than or equal to"@en .
-<http://www.w3.org/ns/odrl/2/gteq> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/2000/01/rdf-schema#label> "Has part"@en .
-<http://www.w3.org/ns/odrl/2/hasPart> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/2000/01/rdf-schema#label> "Is a"@en .
-<http://www.w3.org/ns/odrl/2/isA> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/2000/01/rdf-schema#label> "Is all of"@en .
-<http://www.w3.org/ns/odrl/2/isAllOf> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/2000/01/rdf-schema#label> "Is any of"@en .
-<http://www.w3.org/ns/odrl/2/isAnyOf> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/2000/01/rdf-schema#label> "Is none of"@en .
-<http://www.w3.org/ns/odrl/2/isNoneOf> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/2000/01/rdf-schema#label> "Is part of"@en .
-<http://www.w3.org/ns/odrl/2/isPartOf> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/2000/01/rdf-schema#label> "Less than"@en .
-<http://www.w3.org/ns/odrl/2/lt> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/2000/01/rdf-schema#label> "Less than or equal to"@en .
-<http://www.w3.org/ns/odrl/2/lteq> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Operator> .
 <http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
 <http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/2000/01/rdf-schema#label> "Not equal to"@en .
-<http://www.w3.org/ns/odrl/2/neq> <http://www.w3.org/2000/01/rdf-schema#comment> ""@en .
 <http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Action> .
 <http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
 <http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2000/01/rdf-schema#label> "Accept tracking"@en .
-<http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2000/01/rdf-schema#comment> "The act of accepting that the use of the asset may be recorded."@en .
-<http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2004/02/skos/core#scopeNote> "The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'."@en .
+<http://www.w3.org/ns/odrl/2/acceptTracking> <http://www.w3.org/2000/01/rdf-schema#comment> "The act of accepting that the use of the asset may be recorded. The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'."@en .
 <http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Action> .
 <http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
 <http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2000/01/rdf-schema#label> "Ad-hoc sharing"@en .
-<http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2000/01/rdf-schema#comment> "The act of sharing the asset to parties in close proximity to the owner."@en .
-<http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2004/02/skos/core#scopeNote> "This action may be used to express [OMA] Sharing semantics"@en .
+<http://www.w3.org/ns/odrl/2/adHocShare> <http://www.w3.org/2000/01/rdf-schema#comment> "The act of sharing the asset to parties in close proximity to the owner. This action may be used to express [OMA] Sharing semantics."@en .
 <http://www.w3.org/ns/odrl/2/aggregate> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Action> .
 <http://www.w3.org/ns/odrl/2/aggregate> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
 <http://www.w3.org/ns/odrl/2/aggregate> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -795,12 +796,12 @@
 <http://www.w3.org/ns/odrl/2/count> <http://www.w3.org/2000/01/rdf-schema#label> "count"@en .
 <http://www.w3.org/ns/odrl/2/count> <http://www.w3.org/2000/01/rdf-schema#comment> "The numeric count indicating the number of times the corresponding entity may be exercised"@en .
 <http://www.w3.org/ns/odrl/2/count> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#nonNegativeInteger> .
-_:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2001/XMLSchema#dateTime> .
-_:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2001/XMLSchema#date> .
-_:genid2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid1 .
-_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
-_:genid3 <http://www.w3.org/2002/07/owl#unionOf> _:genid2 .
+_:genid10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2001/XMLSchema#dateTime> .
+_:genid10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:genid11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/2001/XMLSchema#date> .
+_:genid11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:genid10 .
+_:genid12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+_:genid12 <http://www.w3.org/2002/07/owl#unionOf> _:genid11 .
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> .
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -808,7 +809,7 @@
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2000/01/rdf-schema#label> "date/time"@en .
 <http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2000/01/rdf-schema#comment> "The date (and optional time and timezone) representing a point in time or period."@en .
-<http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2000/01/rdf-schema#range> _:genid3 .
+<http://www.w3.org/ns/odrl/2/dateTime> <http://www.w3.org/2000/01/rdf-schema#range> _:genid12 .
 <http://www.w3.org/ns/odrl/2/deliveryChannel> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/deliveryChannel> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
 <http://www.w3.org/ns/odrl/2/deliveryChannel> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
@@ -888,14 +889,15 @@
 <http://www.w3.org/ns/odrl/2/percentage> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/percentage> <http://www.w3.org/2000/01/rdf-schema#label> "percentage"@en .
 <http://www.w3.org/ns/odrl/2/percentage> <http://www.w3.org/2000/01/rdf-schema#comment> "The amount (as a percentage) of the action applicable to the asset."@en .
-<http://www.w3.org/ns/odrl/2/percentage> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2000/01/rdf-schema#Literal> .
+<http://www.w3.org/ns/odrl/2/percentage> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#decimal> .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
-<http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
+<http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/ns/odrl/2/rightOperand> .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2000/01/rdf-schema#label> "product"@en .
 <http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2000/01/rdf-schema#comment> "The specified Product or Service name."@en .
+<http://www.w3.org/ns/odrl/2/product> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#string> .
 <http://www.w3.org/ns/odrl/2/proximity> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <http://www.w3.org/ns/odrl/2/proximity> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> .
 <http://www.w3.org/ns/odrl/2/proximity> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
--- a/2/ODRL20.rdf	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/ODRL20.rdf	Mon Sep 09 21:39:07 2013 +0100
@@ -193,11 +193,10 @@
   </rdf:Property>
   <Action rdf:about="http://www.w3.org/ns/odrl/2/acceptTracking">
     <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
-    <rdfs:comment xml:lang="en">The act of accepting that the use of the asset may be recorded.</rdfs:comment>
+    <rdfs:comment xml:lang="en">The act of accepting that the use of the asset may be recorded. The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'.</rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Accept tracking</rdfs:label>
     <vs:term_status>testing</vs:term_status>
-    <skos:scopeNote xml:lang="en">The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'.</skos:scopeNote>
   </Action>
   <rdf:Property rdf:about="http://www.w3.org/ns/odrl/2/action">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
@@ -265,11 +264,10 @@
   </skos:ConceptScheme>
   <Action rdf:about="http://www.w3.org/ns/odrl/2/adHocShare">
     <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
-    <rdfs:comment xml:lang="en">The act of sharing the asset to parties in close proximity to the owner.</rdfs:comment>
+    <rdfs:comment xml:lang="en">The act of sharing the asset to parties in close proximity to the owner. This action may be used to express [OMA] Sharing semantics.</rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Ad-hoc sharing</rdfs:label>
     <vs:term_status>testing</vs:term_status>
-    <skos:scopeNote xml:lang="en">This action may be used to express [OMA] Sharing semantics</skos:scopeNote>
   </Action>
   <Action rdf:about="http://www.w3.org/ns/odrl/2/aggregate">
     <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
@@ -514,8 +512,21 @@
     <rdfs:domain rdf:resource="http://www.w3.org/ns/odrl/2/Permission"/>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">duty</rdfs:label>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Duty"/>
+    <rdfs:range>
+      <owl:Class>
+        <owl:unionOf>
+          <rdf:Description>
+            <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Duty"/>
+            <rdf:rest>
+              <rdf:Description>
+                <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
+                <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
+              </rdf:Description>
+            </rdf:rest>
+          </rdf:Description>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:range>
     <vs:term_status>testing</vs:term_status>
   </rdf:Property>
   <rdf:Property rdf:about="http://www.w3.org/ns/odrl/2/elapsedTime">
@@ -612,7 +623,6 @@
     <rdfs:label xml:lang="en">function</rdfs:label>
     <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Party"/>
     <vs:term_status>testing</vs:term_status>
-    <skos:scopeNote xml:lang="en"></skos:scopeNote>
   </rdf:Property>
   <Action rdf:about="http://www.w3.org/ns/odrl/2/give">
     <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
@@ -630,21 +640,18 @@
   </Scope>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/gt">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Greater than</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/gteq">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Greater than or equal to</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/hasPart">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Has part</rdfs:label>
     <vs:term_status>testing</vs:term_status>
@@ -735,35 +742,30 @@
   </ConflictTerm>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/isA">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Is a</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/isAllOf">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Is all of</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/isAnyOf">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Is any of</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/isNoneOf">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Is none of</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/isPartOf">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Is part of</rdfs:label>
     <vs:term_status>testing</vs:term_status>
@@ -799,14 +801,12 @@
   </Action>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/lt">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Less than</rdfs:label>
     <vs:term_status>testing</vs:term_status>
   </Operator>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/lteq">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Less than or equal to</rdfs:label>
     <vs:term_status>testing</vs:term_status>
@@ -844,7 +844,6 @@
   </Action>
   <Operator rdf:about="http://www.w3.org/ns/odrl/2/neq">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#NamedIndividual"/>
-    <rdfs:comment xml:lang="en"></rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">Not equal to</rdfs:label>
     <vs:term_status>testing</vs:term_status>
@@ -934,7 +933,7 @@
     <rdfs:comment xml:lang="en">The amount (as a percentage) of the action applicable to the asset.</rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">percentage</rdfs:label>
-    <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
+    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#decimal"/>
     <rdfs:subPropertyOf rdf:resource="http://www.w3.org/ns/odrl/2/rightOperand"/>
     <vs:term_status>testing</vs:term_status>
   </rdf:Property>
@@ -951,8 +950,21 @@
     <rdfs:domain rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">permission</rdfs:label>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Permission"/>
+    <rdfs:range>
+      <owl:Class>
+        <owl:unionOf>
+          <rdf:Description>
+            <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Permission"/>
+            <rdf:rest>
+              <rdf:Description>
+                <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
+                <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
+              </rdf:Description>
+            </rdf:rest>
+          </rdf:Description>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:range>
     <vs:term_status>testing</vs:term_status>
   </rdf:Property>
   <Action rdf:about="http://www.w3.org/ns/odrl/2/play">
@@ -986,10 +998,11 @@
     <vs:term_status>testing</vs:term_status>
   </Action>
   <rdf:Property rdf:about="http://www.w3.org/ns/odrl/2/product">
-    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
     <rdfs:comment xml:lang="en">The specified Product or Service name.</rdfs:comment>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">product</rdfs:label>
+    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
     <rdfs:subPropertyOf rdf:resource="http://www.w3.org/ns/odrl/2/rightOperand"/>
     <vs:term_status>testing</vs:term_status>
   </rdf:Property>
@@ -1006,8 +1019,21 @@
     <rdfs:domain rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
     <rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
     <rdfs:label xml:lang="en">prohibition</rdfs:label>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
-    <rdfs:range rdf:resource="http://www.w3.org/ns/odrl/2/Prohibition"/>
+    <rdfs:range>
+      <owl:Class>
+        <owl:unionOf>
+          <rdf:Description>
+            <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Prohibition"/>
+            <rdf:rest>
+              <rdf:Description>
+                <rdf:first rdf:resource="http://www.w3.org/ns/odrl/2/Action"/>
+                <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
+              </rdf:Description>
+            </rdf:rest>
+          </rdf:Description>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:range>
     <vs:term_status>testing</vs:term_status>
   </rdf:Property>
   <rdf:Property rdf:about="http://www.w3.org/ns/odrl/2/proximity">
--- a/2/ODRL20.ttl	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/ODRL20.ttl	Mon Sep 09 21:39:07 2013 +0100
@@ -194,7 +194,10 @@
 	rdfs:label "permission"@en ;
 	rdfs:comment "Relates the description of an individual Permission to a Policy. A permission can be specified either in terms of an Action alone, or an instance of Permission relating an Action and one or more other attributes."@en ;
 	rdfs:domain :Policy ;
-	rdfs:range :Permission , :Action .
+	rdfs:range [
+		a owl:Class ;
+		owl:unionOf ( :Permission :Action ) ;
+	] .
 
 :prohibition
 	a rdf:Property , owl:ObjectProperty ;
@@ -203,7 +206,10 @@
 	rdfs:label "prohibition"@en ;
 	rdfs:comment "Relates the description of an individual Prohibition to a Policy. A prohibition can be specified either in terms of an Action alone, or an instance of Prohibition relating an Action and one or more other attributes."@en ;
 	rdfs:domain :Policy ;
-	rdfs:range :Prohibition , :Action .
+	rdfs:range [
+		a owl:Class ;
+		owl:unionOf ( :Prohibition  :Action ) ;
+	] .
 
 :inheritAllowed
 	a rdf:Property , owl:DatatypeProperty ;
@@ -314,7 +320,6 @@
 	vs:term_status "testing" ;
 	rdfs:label "function"@en ;
 	rdfs:comment "Function is an abstract property whose sub-properties define the roles which may be fulfilled by a party in relation to a Rule."@en ;
-	skos:scopeNote ""@en ;
 	rdfs:domain :Rule ;
 	rdfs:range :Party .
 
@@ -343,7 +348,10 @@
 	rdfs:label "duty"@en ;
 	rdfs:comment "A Duty indicates requirements which must be fulfilled in order to receive the permission."@en ;
 	rdfs:domain :Permission ;
-	rdfs:range :Duty , :Action .
+	rdfs:range [
+		a owl:Class ;
+		owl:unionOf ( :Duty :Action ) ;
+	] .
 
 :unit
 	a rdf:Property ;
@@ -400,78 +408,67 @@
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Greater than"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Greater than"@en .
 
 :gteq
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Greater than or equal to"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Greater than or equal to"@en .
 
 :hasPart
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Has part"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Has part"@en .
 
 :isA
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Is a"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Is a"@en .
 
 :isAllOf
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Is all of"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Is all of"@en .
 
 :isAnyOf
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Is any of"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Is any of"@en .
 
 :isNoneOf
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Is none of"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Is none of"@en .
 
 :isPartOf
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Is part of"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Is part of"@en .
 
 :lt
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Less than"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Less than"@en .
 
 :lteq
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Less than or equal to"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Less than or equal to"@en .
 
 :neq
 	a :Operator, owl:NamedIndividual ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
-	rdfs:label "Not equal to"@en ;
-	rdfs:comment ""@en .
+	rdfs:label "Not equal to"@en .
 
 ## Actions
 
@@ -480,16 +477,14 @@
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
 	rdfs:label "Accept tracking"@en ;
-	rdfs:comment "The act of accepting that the use of the asset may be recorded."@en ;
-	skos:scopeNote "The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'."@en .
+	rdfs:comment "The act of accepting that the use of the asset may be recorded. The collected information may be tracked by the assigner, or may link to a Party with role function 'trackingParty'."@en .
 
 :adHocShare
 	a :Action, skos:Concept ;
 	rdfs:isDefinedBy odrl: ;
 	vs:term_status "testing" ;
 	rdfs:label "Ad-hoc sharing"@en ;
-	rdfs:comment "The act of sharing the asset to parties in close proximity to the owner."@en ;
-	skos:scopeNote "This action may be used to express [OMA] Sharing semantics"@en .
+	rdfs:comment "The act of sharing the asset to parties in close proximity to the owner. This action may be used to express [OMA] Sharing semantics."@en .
 
 :aggregate
 	a :Action, skos:Concept ;
@@ -998,15 +993,16 @@
 	vs:term_status "testing" ;
 	rdfs:label "percentage"@en ;
 	rdfs:comment "The amount (as a percentage) of the action applicable to the asset."@en ;
-	rdfs:range rdfs:Literal .
+	rdfs:range xsd:decimal .
 
 :product
-    a rdf:Property , owl:ObjectProperty ;
+    a rdf:Property , owl:DatatypeProperty ;
 	rdfs:isDefinedBy odrl: ;
 	rdfs:subPropertyOf :rightOperand ;
 	vs:term_status "testing" ;
 	rdfs:label "product"@en ;
-	rdfs:comment "The specified Product or Service name."@en .
+	rdfs:comment "The specified Product or Service name."@en ;
+	rdfs:range xsd:string .
 
 :proximity
     a rdf:Property , owl:DatatypeProperty ;
--- a/2/ODRL20.var	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/ODRL20.var	Mon Sep 09 21:39:07 2013 +0100
@@ -1,5 +1,8 @@
 URI: ODRL20
 
+URI: ODRL20.html
+Content-Type: text/html;qs=1.0
+
 URI: ODRL20.xsd
 Content-Type: application/xml;qs=0.9
 
--- a/2/template.phtml	Mon Sep 09 21:03:58 2013 +0100
+++ b/2/template.phtml	Mon Sep 09 21:39:07 2013 +0100
@@ -5,6 +5,10 @@
     <title><?php echo htmlspecialchars($vocab->label()); ?></title>
 	<link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/w3c-unofficial">
 	<link rel="stylesheet" type="text/css" href="local.css">
+	<link rel="alternate" type="text/turtle" href="ODRL20.ttl">
+	<link rel="alternate" type="application/rdf+xml" href="ODRL20.rdf">
+	<link rel="alternate" type="application/xml" href="ODRL20.xsd">
+	<link rel="alternate" type="text/plain" href="ODRL20.nt">
 </head>
 <body>
     <div class="container">
--- a/classes.php	Mon Sep 09 21:03:58 2013 +0100
+++ b/classes.php	Mon Sep 09 21:39:07 2013 +0100
@@ -7,25 +7,47 @@
             return "<a href=\"#term-$name\">$name</a>";
         }
 
+		protected function addPropertyList(&$list, $values, $skip)
+		{
+			foreach($values as $value)
+			{
+				if(in_array(strval($value), $skip))
+				{
+					continue;
+				}
+				if($value instanceof EasyRdf_Collection)
+				{
+					$this->addPropertyList($list, $value, $skip);
+					continue;
+				}
+				if($value instanceof EasyRdf_Resource && $value->isBNode())
+				{
+					$union = $value->all('owl:unionOf');
+					$this->addPropertyList($list, $union, $skip);
+					continue;
+				}
+                if ($value instanceof Phpspecgen_Term)
+				{
+                    array_push($list, $value->termLink());
+                }
+				else if ($value instanceof EasyRdf_Resource)
+				{
+                	array_push($list, $value->htmlLink($value->shorten()));
+                }
+				else
+				{
+                    array_push($list, strval($value));
+                }				
+			}
+		}
+
         public function propertyList($property, $skip = null) {
             $items = array();
 			if(!is_array($skip))
 			{
 				$skip = array();
 			}
-            foreach ($this->all($property) as $value) {
-				if(in_array(strval($value), $skip))
-				{
-					continue;
-				}
-                if ($value instanceof Phpspecgen_Term) {
-                    array_push($items, $value->termLink());
-                } else if ($value instanceof EasyRdf_Resource) {
-                    array_push($items, $value->htmlLink($value->shorten()));
-                } else {
-                    array_push($items, strval($value));
-                }
-            }
+			$this->addPropertyList($items, $this->all($property), $skip);
             return $items;
         }
 
@@ -295,6 +317,7 @@
                                  "<td>".join(', ', $properties)."</td></tr>\n";
                 }
                 $html .= $term->propertyRow("Range", "rdfs:range");
+                $html .= $term->propertyRow("In range of", "^rdfs:range");
                 $html .= $term->propertyRow("Domain", "rdfs:domain");
 				$html .= $term->propertyRow('Instances', '^rdf:type');
                 $html .= $term->propertyRow("See Also", "rdfs:seeAlso");