Apply final spec changes to 2.1
authorMo McRoberts <mo.mcroberts@bbc.co.uk>
Thu, 02 Apr 2015 12:48:30 +0100
changeset 60 64125b8ab0ba
parent 59 28fea0fd561e
child 61 f0b46d4e8b6e
Apply final spec changes to 2.1
2/Makefile
2/ODRL20.html
2/ODRL21.html
2/ODRL21.json
2/ODRL21.nt
2/ODRL21.rdf
2/ODRL21.ttl
2/ODRL21.xsd
2/W3C-CG-ODRL-FS.png
2/template.phtml
2/template20.phtml
2/template21.phtml
classes.php
phpspecgen.php
--- a/2/Makefile	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/Makefile	Thu Apr 02 12:48:30 2015 +0100
@@ -17,8 +17,8 @@
 %.nt: %.ttl
 	$(RAPPER) -i turtle -o ntriples $< > [email protected]
 
-ODRL20.html: ODRL20.ttl ../phpspecgen.php ../classes.php template.phtml
-	php -f ../phpspecgen.php $< '$(NSURI)' > [email protected]
+ODRL20.html: ODRL20.ttl ../phpspecgen.php ../classes.php template20.phtml
+	php -f ../phpspecgen.php $< '$(NSURI)' ODRL20 'template20.phtml' > [email protected]
 
 ODRL21.html: ODRL21.ttl ../phpspecgen.php ../classes.php template21.phtml
-	php -f ../phpspecgen.php $< '$(NSURI)' 'template21.phtml' > [email protected]
+	php -f ../phpspecgen.php $< '$(NSURI)' ODRL21 'template21.phtml' > [email protected]
--- a/2/ODRL20.html	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL20.html	Thu Apr 02 12:48:30 2015 +0100
@@ -10,11 +10,12 @@
 	<link rel="alternate" type="application/xml" href="ODRL20.xsd">
 	<link rel="alternate" type="text/plain" href="ODRL20.nt">
 </head>
-<body>
+<body style="background-image: url('W3C-CG-ODRL-FS.png');">
 <h1>Open Digital Rights Language (ODRL) Ontology</h1>
 <em>The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media.</em>
 <dl>
-<dt>Latest Version</dt><dd><a href="http://www.w3.org/ns/odrl/2/">http://www.w3.org/ns/odrl/2/</a></dd>
+<dt>This version</dt><dd><a href="http://www.w3.org/ns/odrl/2/ODRL20">http://www.w3.org/ns/odrl/2/ODRL20</a></dd>
+<dt>Latest version</dt><dd><a href="http://www.w3.org/ns/odrl/2/">http://www.w3.org/ns/odrl/2/</a></dd>
 <dt>Date</dt><dd>2014-05-12</dd>
 <dt>Revision</dt><dd>2.0</dd>
 <dt>Authors</dt><dd>Mo McRoberts (BBC), Víctor Rodríguez Doncel (OEG-UPM)</dd>
@@ -200,7 +201,12 @@
 _:requirements
 	a odrl:Duty ;
 	odrl:action odrl:pay ;
-	odrl:target &lt;http://example.com/ubl:AUD0.50&gt; .
+	odrl:constraint [
+		a odrl:Constraint ;
+		odrl:payAmount 50.00 ;
+		odrl:operator odrl:eq ;
+		odrl:unit &lt;http://cvx.iptc.org/iso4217a:AUD&gt;
+	] .
 
 &lt;http://example.com/sony:10&gt; a odrl:Party .
 </code></pre><p>Download this example as <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example2.ttl">Turtle</a>, <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example2.rdf">RDF/XML</a>, or <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example2.nt">N-Triples</a>.</p>
@@ -238,7 +244,12 @@
 _:requirements
 	a odrl:Duty ;
 	odrl:action odrl:pay ;
-	odrl:target &lt;http://example.com/ubl:AUD0.50&gt; .
+	odrl:constraint [
+		a odrl:Constraint ;
+		odrl:payAmount 50.00 ;
+		odrl:operator odrl:eq ;
+		odrl:unit &lt;http://cvx.iptc.org/iso4217a:AUD&gt;
+	] .
 
 &lt;http://example.com/sony:10&gt; a odrl:Party .
 &lt;http://example.com/billie:888&gt; a odrl:Party .
@@ -314,7 +325,12 @@
 &lt;http://example.com/duty:01&gt;
 	a odrl:Duty ;
 	odrl:action odrl:pay ;
-	odrl:target &lt;http://example.com/ubl:EU1000.00&gt; .
+	odrl:constraint [
+		a odrl:Constraint ;
+		odrl:payAmount 1000.00 ;
+		odrl:operator odrl:eq ;
+		odrl:unit &lt;http://cvx.iptc.org/iso4217a:EUR&gt;
+	] .
 
 &lt;http://example.com/duty:02&gt;
 	a odrl:Duty ;
@@ -466,6 +482,7 @@
 <p>The <a href="#term-index">index</a> permission is granted to the target asset. Additionally, the <code>x:collection</code> asset specifies which database the index outcome should be stored in.</p>
 
 <pre><code>@prefix odrl: &lt;http://www.w3.org/ns/odrl/2/&gt; .
[email protected] rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; .
 @prefix x: &lt;http://example.com/x#&gt; .
 
 &lt;http://example.com/policy:881212&gt;
@@ -476,6 +493,9 @@
 		odrl:target &lt;http://example.com/archive/2010&gt; ;
 		x:collection &lt;http://example.com/x/database&gt;
 	] .
+
+x:collection 
+	rdfs:subPropertyOf odrl:relation .
 </code></pre><p>Download this example as <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example11.ttl">Turtle</a>, <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example11.rdf">RDF/XML</a>, or <a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/example11.nt">N-Triples</a>.</p>
 <h2 id="sec-classes">Classes</h2>
 <h3 id="term-Asset">Asset</h3
--- a/2/ODRL21.html	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.html	Thu Apr 02 12:48:30 2015 +0100
@@ -11,25 +11,26 @@
 	<link rel="alternate" type="text/plain" href="ODRL21.nt">
 	<link rel="alternate" type="application/json" href="ODRL21.json">	
 </head>
-<body>
+<body style="background-image: url('W3C-CG-ODRL-FS.png');">
 <h1>ODRL Version 2.1 Ontology</h1>
 <em>The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media.</em>
 <dl>
-<dt>Latest Version</dt><dd><a href="http://www.w3.org/ns/odrl/2/">http://www.w3.org/ns/odrl/2/</a></dd>
-<dt>Date</dt><dd>2015-01-18</dd>
+<dt>This version</dt><dd><a href="http://www.w3.org/ns/odrl/2/ODRL21">http://www.w3.org/ns/odrl/2/ODRL21</a></dd>
+<dt>Latest version</dt><dd><a href="http://www.w3.org/ns/odrl/2/">http://www.w3.org/ns/odrl/2/</a></dd>
+<dt>Date</dt><dd>2015-03-05</dd>
 <dt>Revision</dt><dd>2.1</dd>
 <dt>Authors</dt><dd>Mo McRoberts (BBC), Víctor Rodríguez Doncel (OEG-UPM)</dd>
 <dt>Contributors</dt><dd>ODRL Community Group</dd>
 </dl>
 
 <h2 id="sec-status">Status of this document</h2>
-<p>This FINAL DRAFT specification was published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a>. It is not a W3C Standard nor is it on the W3C Standards Track. Please note that under the <a href="http://www.w3.org/community/about/agreements/cla/">W3C Community Contributor License Agreement (CLA)</a> there is a limited opt-out and other conditions apply. Learn more about <a href="http://www.w3.org/community/">W3C Community and Business Groups</a>.</p>
+<p>This FINAL specification was published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a>. It is not a W3C Standard nor is it on the W3C Standards Track. Please note that under the <a href="http://www.w3.org/community/about/agreements/cla/">W3C Community Contributor License Agreement (CLA)</a> there is a limited opt-out and other conditions apply. Learn more about <a href="http://www.w3.org/community/">W3C Community and Business Groups</a>.</p>
 
 <p>The <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> publishes a Final Specification to indicate that the document is believed to be mature and stable for implementation by the wider community. This Draft Specification is not yet endorsed by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> as appropriate for widespread deployment and that promotes the Community Groups’s mission.</p>
 
 <p>Discussion and feedback of this document takes place on the W3C ODRL Community Group mailing list (see <a href="http://lists.w3.org/Archives/Public/public-odrl-contrib/">Contributor Archive</a>). Feedback from the public is encouraged and can be send to <a href="mailto:[email protected]">[email protected]</a> (see <a href="http://lists.w3.org/Archives/Public/public-odrl/">Public Archive</a>).</p>
 
-<p>Copyright © 2014 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
+<p>Copyright © 2015 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
 
 <h2 id="sec-ns">Namespace URI</h2>
 <p>
--- a/2/ODRL21.json	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.json	Thu Apr 02 12:48:30 2015 +0100
@@ -2,7 +2,7 @@
     "type": "object",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "ODRL JSON Schema",
-    "description": "ODRL JSON Schema (Draft September 2014)",
+    "description": "This is the JSON Schema for ODRL Version 2.1 (Final Specification, 5 March 2015) Copyright © 2015 the Contributors to the Final Specification, published by the W3C ODRL Community Group (https://www.w3.org/community/odrl/) under the W3C Community Final Specification Agreement (http://www.w3.org/community/about/agreements/final/). A human-readable summary is available (http://www.w3.org/community/about/agreements/fsa-deed/).",
     "id": "http://www.w3.org/ns/odrl/2/jsonschema#",
     "definitions": {"prohibdutytype": {
         "type": "array",
--- a/2/ODRL21.nt	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.nt	Thu Apr 02 12:48:30 2015 +0100
@@ -7,9 +7,11 @@
 <http://www.w3.org/ns/odrl/2/> <http://purl.org/vocab/vann/example> <http://www.w3.org/ns/odrl/2/Asset> .
 <http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/creator> "Mo McRoberts (BBC)" .
 <http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/creator> "V\u00EDctor Rodr\u00EDguez Doncel (OEG-UPM)" .
-<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/issued> "2015-01-18"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/issued> "2015-03-05"^^<http://www.w3.org/2001/XMLSchema#date> .
 <http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/contributor> "ODRL Community Group" .
 <http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/description> "The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media."@en .
+<http://www.w3.org/ns/odrl/2/> <http://www.w3.org/2000/01/rdf-schema#comment> "This is the RDF ontology for ODRL Version 2.1 (Final Specification, 5 March 2015) Copyright \u00A9 2015 the Contributors to the Final Specification, published by the W3C ODRL Community Group (https://www.w3.org/community/odrl/) under the W3C Community Final Specification Agreement (http://www.w3.org/community/about/agreements/final/). A human-readable summary is available (http://www.w3.org/community/about/agreements/fsa-deed/)."@en .
+<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/license> <http://www.w3.org/community/about/agreements/final/> .
 <http://www.w3.org/ns/odrl/2/ODRL21.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/dc/dcmitype/Text> .
 <http://www.w3.org/ns/odrl/2/ODRL21.ttl> <http://www.w3.org/2000/01/rdf-schema#label> "ODRL 2.1 (Turtle)"@en .
 <http://www.w3.org/ns/odrl/2/ODRL21.ttl> <http://xmlns.com/foaf/0.1/primaryTopic> <http://www.w3.org/ns/odrl/2/> .
--- a/2/ODRL21.rdf	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.rdf	Thu Apr 02 12:48:30 2015 +0100
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF
-   xmlns:dcmit="http://purl.org/dc/dcmitype/"
+<rdf:RDF xmlns:dcmit="http://purl.org/dc/dcmitype/"
    xmlns:dct="http://purl.org/dc/terms/"
    xmlns:foaf="http://xmlns.com/foaf/0.1/"
    xmlns:ont="http://purl.org/net/ns/ontology-annot#"
@@ -18,11 +17,13 @@
     <dct:creator>Mo McRoberts (BBC)</dct:creator>
     <dct:creator>Víctor Rodríguez Doncel (OEG-UPM)</dct:creator>
     <dct:description xml:lang="en">The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media.</dct:description>
-    <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-01-18</dct:issued>
+    <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2015-03-05</dct:issued>
+    <dct:license rdf:resource="http://www.w3.org/community/about/agreements/final/"/>
     <vann:example rdf:resource="http://www.w3.org/ns/odrl/2/Asset"/>
     <vann:preferredNamespacePrefix>odrl</vann:preferredNamespacePrefix>
     <vann:preferredNamespaceUri rdf:resource="http://w3.org/ns/odrl/2/"/>
     <rdf:type rdf:resource="http://purl.org/vocommons/voaf#Vocabulary"/>
+    <rdfs:comment xml:lang="en">This is the RDF ontology for ODRL Version 2.1 (Final Specification, 5 March 2015) Copyright © 2015 the Contributors to the Final Specification, published by the W3C ODRL Community Group (https://www.w3.org/community/odrl/) under the W3C Community Final Specification Agreement (http://www.w3.org/community/about/agreements/final/). A human-readable summary is available (http://www.w3.org/community/about/agreements/fsa-deed/).</rdfs:comment>
     <rdfs:label xml:lang="en">ODRL Version 2.1 Ontology</rdfs:label>
     <owl:versionInfo>2.1</owl:versionInfo>
   </owl:Ontology>
--- a/2/ODRL21.ttl	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.ttl	Thu Apr 02 12:48:30 2015 +0100
@@ -22,9 +22,11 @@
 	vann:preferredNamespacePrefix "odrl" ;
 	vann:example :Asset ;
 	dct:creator "Mo McRoberts (BBC)", "Víctor Rodríguez Doncel (OEG-UPM)" ;
-	dct:issued "2015-01-18"^^xsd:date ;
+	dct:issued "2015-03-05"^^xsd:date ;
 	dct:contributor "ODRL Community Group" ;
-	dct:description "The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media."@en .
+	dct:description "The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media."@en ;
+	rdfs:comment "This is the RDF ontology for ODRL Version 2.1 (Final Specification, 5 March 2015) Copyright © 2015 the Contributors to the Final Specification, published by the W3C ODRL Community Group (https://www.w3.org/community/odrl/) under the W3C Community Final Specification Agreement (http://www.w3.org/community/about/agreements/final/). A human-readable summary is available (http://www.w3.org/community/about/agreements/fsa-deed/)."@en ;
+	dct:license <http://www.w3.org/community/about/agreements/final/> .
 
 <http://www.w3.org/ns/odrl/2/ODRL21.ttl>
 	a dcmit:Text ;
--- a/2/ODRL21.xsd	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/ODRL21.xsd	Thu Apr 02 12:48:30 2015 +0100
@@ -1,128 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:o="http://www.w3.org/ns/odrl/2/" version="2.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/ns/odrl/2/" elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-    <xs:element name="Policy" type="o:Policy"/>
-    <xs:complexType name="Policy">
-                <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                    <xs:element ref="o:permission" minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:element ref="o:prohibition" minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-                <xs:attribute name="uid" type="o:URIQnameQcode" use="required"/>
-                <xs:attribute name="type" type="o:URIQnameQcode" use="required"/>
-                <xs:attribute name="conflict" type="o:ConflictTerm"/>
-                <xs:attribute name="undefined" type="o:UndefinedTerm"/>
-                <xs:attribute name="inheritAllowed" type="xs:boolean"/>
-                <xs:attribute name="inheritFrom" type="o:URIQnameQcode"/>
-                <xs:attribute name="inheritRelation" type="o:URIQnameQcode"/>
-                <xs:attribute name="profile" type="o:URIQnameQcode"/>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>     
-    </xs:complexType>
-    
-    <xs:element name="permission" type="o:Permission"/>
-    <xs:complexType name="Permission">
-           <xs:sequence>
-                    <xs:element ref="o:asset" maxOccurs="unbounded"/>
-                    <xs:element ref="o:action" />
-                    <xs:element ref="o:constraint"  minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:element ref="o:duty"  minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-           </xs:sequence>
-           <xs:attributeGroup ref="o:idAttributes"/>        
-    </xs:complexType>
-    
-    <xs:element name="prohibition" type="o:Prohibition"/> 
-    <xs:complexType name="Prohibition">
-        <xs:sequence>
-            <xs:element ref="o:asset"  maxOccurs="unbounded"/>
-            <xs:element ref="o:action" />
-            <xs:element ref="o:constraint" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
-            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
-    
-    <xs:element name="duty" type="o:Duty"/>
-    <xs:complexType name="Duty">
-        <xs:sequence>
-            <xs:element ref="o:action" minOccurs="0"/> <!--Required Element-->
-            <xs:element ref="o:asset"  minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="o:constraint"  minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
-            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="uid" type="o:URIQnameQcode"/>
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
-    
-    <xs:element name="asset" type="o:Asset"/> 
-    <xs:complexType name="Asset">
-        <xs:attribute name="uid" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attribute name="relation" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
-    
-    <xs:element name="party" type="o:Party"/>
-    <xs:complexType name="Party">
-        <xs:attribute name="uid" type="o:URIQnameQcode"/> <!--Required Attribute-->
-        <xs:attribute name="function" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attribute name="scope" type="o:URIQnameQcode"/>
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
- 
-    <xs:element name="action" type="o:Action"/>
-    <xs:complexType name="Action">
-        <xs:attribute name="name" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
-    
-    <xs:element name="constraint" type="o:Constraint"/>
-    <xs:complexType name="Constraint">
-        <xs:attribute name="name" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attribute name="operator" type="o:URIQnameQcode" /> <!--Required Attribute-->
-        <xs:attribute name="rightOperand" type="o:listOfValues" /> <!--Required Attribute-->
-        <xs:attribute name="dataType" type="o:URIQnameQcode" />
-        <xs:attribute name="unit" type="o:URIQnameQcode" />
-        <xs:attribute name="status" type="xs:string" />
-        <xs:attributeGroup ref="o:idAttributes"/>
-    </xs:complexType>
-    
-    <xs:simpleType name="listOfValues">
-        <xs:list itemType="xs:string"/>
-    </xs:simpleType>
-     
-    <xs:simpleType name="ConflictTerm">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/perm"/>
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/prohibit"/>
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/invalid"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="UndefinedTerm">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/support"/>
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/ignore"/>
-            <xs:enumeration value="http://www.w3.org/ns/odrl/2/invalid"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="URIQnameQcode">
-        <xs:union memberTypes="xs:anyURI xs:QName o:QCode"/>
-    </xs:simpleType>
-    
-    <xs:simpleType name="QCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[^\s:]+:[^\s]+"/>
-        </xs:restriction>
-        
-    </xs:simpleType>
-    <xs:attributeGroup name="idAttributes">
-        <xs:attribute name="id" type="xs:ID"/>
-        <xs:attribute name="idref" type="xs:IDREF"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:attributeGroup>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:o="http://www.w3.org/ns/odrl/2/" version="2.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.w3.org/ns/odrl/2/" elementFormDefault="qualified" attributeFormDefault="unqualified">
+    <xs:annotation>
+        <xs:documentation>
+            This is the XML Schema for ODRL Version 2.1 (Final Specification, 5 March 2015)
+            Copyright © 2015 the Contributors to the Final Specification,
+            published by the W3C ODRL Community Group (https://www.w3.org/community/odrl/)
+            under the W3C Community Final Specification Agreement (http://www.w3.org/community/about/agreements/final/).
+            A human-readable summary is available (http://www.w3.org/community/about/agreements/fsa-deed/).
+        </xs:documentation>
+    </xs:annotation>
+    <xs:element name="Policy" type="o:Policy"/>
+    <xs:complexType name="Policy">
+                <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                    <xs:element ref="o:permission" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element ref="o:prohibition" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:attribute name="uid" type="o:URIQnameQcode" use="required"/>
+                <xs:attribute name="type" type="o:URIQnameQcode" use="required"/>
+                <xs:attribute name="conflict" type="o:ConflictTerm"/>
+                <xs:attribute name="undefined" type="o:UndefinedTerm"/>
+                <xs:attribute name="inheritAllowed" type="xs:boolean"/>
+                <xs:attribute name="inheritFrom" type="o:URIQnameQcode"/>
+                <xs:attribute name="inheritRelation" type="o:URIQnameQcode"/>
+                <xs:attribute name="profile" type="o:URIQnameQcode"/>
+                <xs:anyAttribute namespace="##other" processContents="lax"/>     
+    </xs:complexType>
+    
+    <xs:element name="permission" type="o:Permission"/>
+    <xs:complexType name="Permission">
+           <xs:sequence>
+                    <xs:element ref="o:asset" maxOccurs="unbounded"/>
+                    <xs:element ref="o:action" />
+                    <xs:element ref="o:constraint"  minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element ref="o:duty"  minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+           </xs:sequence>
+           <xs:attributeGroup ref="o:idAttributes"/>        
+    </xs:complexType>
+    
+    <xs:element name="prohibition" type="o:Prohibition"/> 
+    <xs:complexType name="Prohibition">
+        <xs:sequence>
+            <xs:element ref="o:asset"  maxOccurs="unbounded"/>
+            <xs:element ref="o:action" />
+            <xs:element ref="o:constraint" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
+            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+    
+    <xs:element name="duty" type="o:Duty"/>
+    <xs:complexType name="Duty">
+        <xs:sequence>
+            <xs:element ref="o:action" minOccurs="0"/> <!--Required Element-->
+            <xs:element ref="o:asset"  minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="o:constraint"  minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="o:party"  minOccurs="0" maxOccurs="unbounded"/>
+            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="uid" type="o:URIQnameQcode"/>
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+    
+    <xs:element name="asset" type="o:Asset"/> 
+    <xs:complexType name="Asset">
+        <xs:attribute name="uid" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attribute name="relation" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+    
+    <xs:element name="party" type="o:Party"/>
+    <xs:complexType name="Party">
+        <xs:attribute name="uid" type="o:URIQnameQcode"/> <!--Required Attribute-->
+        <xs:attribute name="function" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attribute name="scope" type="o:URIQnameQcode"/>
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+ 
+    <xs:element name="action" type="o:Action"/>
+    <xs:complexType name="Action">
+        <xs:attribute name="name" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+    
+    <xs:element name="constraint" type="o:Constraint"/>
+    <xs:complexType name="Constraint">
+        <xs:attribute name="name" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attribute name="operator" type="o:URIQnameQcode" /> <!--Required Attribute-->
+        <xs:attribute name="rightOperand" type="o:listOfValues" /> <!--Required Attribute-->
+        <xs:attribute name="dataType" type="o:URIQnameQcode" />
+        <xs:attribute name="unit" type="o:URIQnameQcode" />
+        <xs:attribute name="status" type="xs:string" />
+        <xs:attributeGroup ref="o:idAttributes"/>
+    </xs:complexType>
+    
+    <xs:simpleType name="listOfValues">
+        <xs:list itemType="xs:string"/>
+    </xs:simpleType>
+     
+    <xs:simpleType name="ConflictTerm">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/perm"/>
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/prohibit"/>
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/invalid"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <xs:simpleType name="UndefinedTerm">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/support"/>
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/ignore"/>
+            <xs:enumeration value="http://www.w3.org/ns/odrl/2/invalid"/>
+        </xs:restriction>
+    </xs:simpleType>
+    
+    <xs:simpleType name="URIQnameQcode">
+        <xs:union memberTypes="xs:anyURI xs:QName o:QCode"/>
+    </xs:simpleType>
+    
+    <xs:simpleType name="QCode">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[^\s:]+:[^\s]+"/>
+        </xs:restriction>
+        
+    </xs:simpleType>
+    <xs:attributeGroup name="idAttributes">
+        <xs:attribute name="id" type="xs:ID"/>
+        <xs:attribute name="idref" type="xs:IDREF"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+    </xs:attributeGroup>
+</xs:schema>
Binary file 2/W3C-CG-ODRL-FS.png has changed
--- a/2/template.phtml	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/template.phtml	Thu Apr 02 12:48:30 2015 +0100
@@ -20,7 +20,7 @@
 
 <p>Discussion and feedback of this document takes place on the W3C ODRL Community Group mailing list (see <a href="http://lists.w3.org/Archives/Public/public-odrl-contrib/">Contributor Archive</a>). Feedback from the public is encouraged and can be send to <a href="mailto:[email protected]">[email protected]</a> (see <a href="http://lists.w3.org/Archives/Public/public-odrl/">Public Archive</a>).</p>
 
-<p>Copyright © 2013 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
+<p>Copyright © <?php echo strftime('%Y') ?> the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
 
 <h2 id="sec-ns">Namespace URI</h2>
 <p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/2/template20.phtml	Thu Apr 02 12:48:30 2015 +0100
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <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 style="background-image: url('W3C-CG-ODRL-FS.png');">
+<?php print $vocab->htmlHeader(); ?>
+
+<h2 id="sec-status">Status of this document</h2>
+<p>This DRAFT specification was published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a>. It is not a W3C Standard nor is it on the W3C Standards Track. Please note that under the <a href="http://www.w3.org/community/about/agreements/cla/">W3C Community Contributor License Agreement (CLA)</a> there is a limited opt-out and other conditions apply. Learn more about <a href="http://www.w3.org/community/">W3C Community and Business Groups</a>.</p>
+
+<p>The <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> publishes a Final Specification to indicate that the document is believed to be mature and stable for implementation by the wider community. This Draft Specification is not yet endorsed by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> as appropriate for widespread deployment and that promotes the Community Groups’s mission.</p>
+
+<p>Discussion and feedback of this document takes place on the W3C ODRL Community Group mailing list (see <a href="http://lists.w3.org/Archives/Public/public-odrl-contrib/">Contributor Archive</a>). Feedback from the public is encouraged and can be send to <a href="mailto:[email protected]">[email protected]</a> (see <a href="http://lists.w3.org/Archives/Public/public-odrl/">Public Archive</a>).</p>
+
+<p>Copyright © 2013 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
+
+<h2 id="sec-ns">Namespace URI</h2>
+<p>
+	The namespace URI for ODRL 2.0 is <a href="http://www.w3.org/ns/odrl/2/"><code>http://www.w3.org/ns/odrl/2/</code></a>.
+</p>
+<h2 id="sec-alternates">Alternative serialisations</h2>
+<p>
+	The ODRL 2.0 vocabulary is published both in human- and machine-readable forms. A <code>GET</code> request made to the canonical namespace URI will cause <a href="http://www.w3.org/blog/2006/02/content-negotiation/">HTTP Content Negotiation</a> to occur, which means that the most appropriate variant will be served according to your request. However, if you explicitly wish to retrieve a particular serialisation, you can also do so using the following URLs:
+</p>
+<dl>
+	<dt><a href="ODRL20.html">ODRL20.html</a></dt>
+	<dd>HTML (this document)</dd>
+
+	<dt><a href="ODRL20.ttl">ODRL20.ttl</a></dt>
+	<dd>RDF (Turtle)</dd>
+
+	<dt><a href="ODRL20.rdf">ODRL20.rdf</a></dt>
+	<dd>RDF/XML</dd>
+	
+	<dt><a href="ODRL20.nt">ODRL20.nt</a></dt>
+	<dd>RDF (N-Triples)</dd>
+	
+	<dt><a href="ODRL20.xsd">ODRL20.xsd</a></dt>
+	<dd>XML Schema Definition</dd>
+</dl>
+
+<h2 id="sec-toc">Table of Contents</h2>
+<ol class="toc">
+<li><a href="#sec-summary"><span class="secno">1</span> Summary of Terms</a></li>
+<li><a href="#sec-groups"><span class="secno">2</span> Groups</a></li>
+<li><a href="#sec-examples"><span class="secno">3</span> Examples of use</a>
+	<ol class="toc">
+		<li><a href="#sec-example-1"><span class="secno">3.1</span> Set</a></li>
+		<li><a href="#sec-example-2"><span class="secno">3.2</span> Offer</a></li>
+		<li><a href="#sec-example-3"><span class="secno">3.3</span> Agreement</a></li>
+		<li><a href="#sec-example-4"><span class="secno">3.4</span> Request</a></li>
+		<li><a href="#sec-example-5"><span class="secno">3.5</span> Ticket</a></li>
+		<li><a href="#sec-example-6"><span class="secno">3.6</span> Offer and next policy</a></li>
+		<li><a href="#sec-example-7"><span class="secno">3.7</span> Privacy policy</a></li>
+		<li><a href="#sec-example-8"><span class="secno">3.8</span> Permission and prohibition</a></li>
+		<li><a href="#sec-example-9"><span class="secno">3.9</span> Inheritance</a></li>
+		<li><a href="#sec-example-10"><span class="secno">3.10</span> Social network</a></li>
+		<li><a href="#sec-example-11"><span class="secno">3.11</span> Multiple assets</a></li>		
+	</ol>
+</li>
+<li><a href="#sec-classes"><span class="secno">4</span> Classes</a></li>
+<li><a href="#sec-properties"><span class="secno">5</span> Properties</a></li>
+<li><a href="#sec-concept-schemes"><span class="secno">6</span> Concept schemes</a></li>
+<li><a href="#sec-concepts"><span class="secno">7</span> Concepts</a></li>
+<li><a href="#sec-named-individuals"><span class="secno">8</span> Named individuals</a></li>
+<li><a href="#sec-examples"><span class="secno">9</span> Acknowledgements</a></li>
+<li><a href="#sec-examples"><span class="secno">10</span> References</a></li>
+</ol>
+
+<?php print $vocab->htmlSummaryOfTerms(); ?>
+
+<h2 id="sec-groups">Groups</h2>
+<p>Some terms can be organised into logical groups, as shown below:</p>
+<p class="diagram">
+	<img src="diagram.png" alt="ODRL 2.0 Ontology diagram">
+</p>
+<table>
+	<thead>
+		<tr>
+			<th scope="col">Group</th>
+			<th scope="col">Expressed as</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>Policy types</td>
+			<td><a href="#term-Policy">Sub-classes of Policy</a></td>
+		</tr>
+		<tr>
+			<td>Actions</td>
+			<td><a href="#term-Action">Instances of Action</a></td>
+		</tr>
+		<tr>
+			<td>Operators</td>
+			<td><a href="#term-Operator">Instances of Operator</a></td>
+		</tr>
+		<tr>
+			<td>Operands</td>
+			<td><a href="#term-rightOperand">Sub-properties of rightOperand</a></td>
+		</tr>
+		<tr>
+			<td>Functions</td>
+			<td><a href="#term-function">Sub-properties of function</a></td>
+		</tr>
+		<tr>
+			<td>Scopes</td>
+			<td><a href="#term-Party">Sub-classes of Party</a></td>
+		</tr>
+		<tr>
+			<td>Conflict-handling terms</td>
+			<td><a href="#term-ConflictTerm">Instances of ConflictTerm</a></td>
+		</tr>
+		<tr>
+			<td>Unsupported action-handling terms</td>
+			<td><a href="#term-UndefinedTerm">Instances of UndefinedTerm</a></td>
+		</tr>
+	</tbody>
+</table>
+
+<h2 id="sec-examples">Examples of use</h2>
+<p>
+	The examples in this section are RDF expressions of the scenarios provided
+	by the <a href="http://www.w3.org/community/odrl/two/model/#section-3">ODRL Version 2.0 Core Model</a>.
+</p>
+<?php
+function printExample($name)
+{
+	$buf = file_get_contents(dirname(__FILE__) . '/../examples/' . $name . '.ttl');
+	echo '<pre><code>' . htmlspecialchars($buf) . '</code></pre>';
+	echo '<p>Download this example as ';
+	echo '<a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/' . $name . '.ttl">Turtle</a>, ';
+	echo '<a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/' . $name . '.rdf">RDF/XML</a>, or ';
+	echo '<a href="https://dvcs.w3.org/hg/odrl/raw-file/tip/examples/' . $name . '.nt">N-Triples</a>.';
+	echo '</p>';
+}
+?>
+<h3 id="sec-example-1">Set</h3>
+<p>
+	The following shows an instance of a <a href="#term-Set">set</a> <a href="#term-Policy">policy</a>. The set shows a policy expression, stating that the <a href="#term-Asset">asset</a>, <code>http://example.com/asset:9898</code>, is the target of the <a href="#term-Permission">permission</a> to <a href="#term-reproduce">reproduce</a> and the <a href="#term-Prohibition">prohibition</a> to <a href="#term-modify">modify</a>.
+</p>
+<?php printExample('example1'); ?>
+
+<p>Because all of the <a href="#term-Rule">rules</a> associated with this policy have the same target, and do not have any <a href="#term-constraint">constraints</a> or <a href="#term-duty">duties</a> (requirements), one may abbreviate the expression of the policy and use the Dublin Core <a href="http://purl.org/dc/terms/rights">rights</a> or <a href="http://purl.org/dc/terms/license">license</a> predicates to associate the asset with that policy:</p>
+<?php printExample('example1a'); ?>
+
+<h3 id="sec-example-2">Offer</h3>
+<p>
+	The following shows the instance of an <a href="#term-Offer">offer</a> policy. The offer contains the music file <code>http://example.com/music:4545</code> that is offered by the <a href="#term-Party">party</a> <code>http://example.com/sony:10</code> with the permissions to <a href="#term-play">play</a> and copy the file. The permission to copy is only granted once. The two permissions are offered in exchange for a payment of <code>AUD$0.50</code>.
+</p>
+<?php printExample('example2'); ?>
+
+<h3 id="sec-example-3">Agreement</h3>
+
+<p>
+	The following shows the instance of an <a href="#term-Agreement">agreement</a> policy. The agreement contains all entities shown in the offer scenario above. A new party, <code>http://example.com/billie:888</code> has been added. This party accepted the previous offer and thus is now the buyer of the permission play and copy: i.e. they are now linked as <a href="#term-assignee">assignee</a> of the permissions and duty entities.
+</p>
+
+<?php printExample('example3'); ?>
+
+<h3 id="sec-example-4">Request</h3>
+
+<p>
+	The following shows the instance of a <a href="#term-Request">request</a> policy. The party <code>http://example.com/guest:0589</code> has requested the permission to <a href="#term-display">display</a> the target asset, <code>http://example.com/news:0099</code>.
+</p>
+
+<?php printExample('example4'); ?>
+
+<h3 id="sec-example-5">Ticket</h3>
+
+<p>
+	The following shows the instance of a <a href="#term-Ticket">ticket</a> policy. The ticket expresses the play permission for the target asset, <code>http://example.com/game:4589</code>. The ticket is valid <a href="#term-dateTime">until the end of the year</a> <code>2010</code>. Any valid holder of this ticket may exercise this permission.
+</p>
+
+<?php printExample('example5'); ?>
+
+<h3 id="sec-example-6">Offer and next policy</h3>
+
+<p>
+	The following shows the instance of an <a href="#term-Offer">offer</a> policy showing the <a href="#term-nextPolicy">next-policy</a> structure.
+</p>
+	
+<p>
+	The party <code>http://example.com/sony:99</code> assigns the permission distribute directly to the potential buyer of the permission who will pay <code>€1,000</code>. The distribute permission is also constrained to the country <code>Italy</code>. The potential assignee may then distribute the target asset according to the next-policy target asset linked directly from this duty. In this case, the next policy asset stipulates that the potential assignee may only offer the display permission to downstream consumers.
+</p>
+
+<?php printExample('example6'); ?>
+
+<h3 id="sec-example-7">Privacy policy</h3>
+
+<p>The following shows the instance of a <a href="#term-Privacy">privacy</a> policy.</p>
+
+<p>The target asset is personal data and the assignee is allowed to distribute the asset only for the purpose of contacting the subject of the personal data. The purpose value is taken from the <a href="http://www.w3.org/TR/P3P11/#PURPOSE">P3P privacy purpose vocabulary</a>.</p>
+
+<p>Additionally, the assigner (the party who the personal data is about) has stipulated that the assignee must delete the asset after a <code>30 day period</code> (retention policy).</p>
+
+<?php printExample('example7'); ?>
+
+<h3 id="sec-example-8">Permission and prohibition</h3>
+
+<p>
+	The following shows the instance of an agreement policy with both a permission and a prohibition. The party <code>http://example.com/sony:10</code> assigns the permission play to the party <code>http://example.com/billie:888</code> at the same time they are prohibited from utilising the target asset as a <code>mobile:ringtone</code>. Additionally, in case of any conflict, the conflict attribute is set to <a href="#term-perm"><code>perm</code></a> indicating that the permission entity will take precedence.
+</p>
+
+<?php printExample('example8'); ?>
+
+<h3 id="sec-example-9">Inheritance</h3>
+
+<p>
+	The following shows the instance of a (child) policy <code>http://example.com/policy:9999</code> <a href="#term-inheritFrom">inheriting from</a> another (parent) policy <code>http://example.com/policy:5531</code>. The inherit-from attribute of the (child) policy has the same identifier as the (parent) policy's own identifier.
+</p>
+
+<p>
+	In this inheritance example, the parent policy allows the party <code>http://example.com/billie:888</code> to print the parent’s target asset. The child policy allows the party <code>http://example.com/class:IT01</code> (a group of people) to display the child’s target asset. Since the child policy also inherits from the parent policy, then the party <code>http://example.com/class:IT01</code> can also print the parent’s target asset.</p>
+
+<?php printExample('example9'); ?>
+
+<h3 id="sec-example-10">Social network</h3>
+
+<p>The following shows the instance of an agreement policy for a social network scenario.</p>
+
+<p>
+	The target asset are photos posted to a social network site and the assigner is the owner of the photos. The assignee is a group and represents the football network members on the social network, who are each allowed to display the photos.
+</p>
+
+<?php printExample('example10'); ?>
+
+<h3 id="sec-example-11">Multiple assets</h3>
+
+<p>The following shows an instance of a set policy utilising multiple asset entities.</p>
+
+<p>The <a href="#term-index">index</a> permission is granted to the target asset. Additionally, the <code>x:collection</code> asset specifies which database the index outcome should be stored in.</p>
+
+<?php printExample('example11'); ?>
+
+<?php
+print $vocab->htmlTerms('Phpspecgen_Class', 'Classes');
+print $vocab->htmlTerms('Phpspecgen_Property', 'Properties');
+print $vocab->htmlTerms('Phpspecgen_ConceptScheme', 'Concept schemes');
+print $vocab->htmlTerms('Phpspecgen_Concept', 'Concepts');
+print $vocab->htmlTerms('Phpspecgen_Individual', 'Named individuals');
+?>
+
+<h2 id="sec-acknowledgements">Acknowledgements</h2>
+<p>
+	The authors gratefully acknowledge feedback and contributions to this document from <a href="http://www.w3.org/community/odrl/">members of the W3C ODRL Community Group</a>.
+</p>
+
+<p>
+	This document was generated using <a href="https://github.com/njh/phpspecgen">phpspecgen</a> written by <a href="https://github.com/njh">Nicholas J. Humfrey</a> and modified by <a href="https://github.com/moustaki">Yves Raimond</a>, and subsequently modified by Mo McRoberts.
+</p>
+
+<h2 id="sec-references">References</h2>
+<dl class="bibliography">
+	<dt id="ODRL-MODEL"><a href="http://www.w3.org/community/odrl/two/model/">[ODRL-MODEL]</a></dt>
+	<dd>
+		R. Iannella, S. Guth, D. Paehler &amp; A. Kasten (eds.)
+		Open Digital Rights Language (ODRL) Version 2.0 - Core Model.
+		Final Specification, W3C ODRL Community Group, 24 April 2012.
+		<a href="http://www.w3.org/community/odrl/two/model/">http://www.w3.org/community/odrl/two/model/</a>
+	</dd>
+	<dt id="ODRL-VOCAB"><a href="http://www.w3.org/community/odrl/two/vocab/">[ODRL-VOCAB]</a></dt>
+	<dd>
+		S. Guth &amp; R. Iannella (eds).
+		Open Digital Rights Language (ODRL) Version 2.0 – Common Vocabulary.
+		Final Specification, W3C ODRL Community Group, 19 April 2012.
+		<a href="http://www.w3.org/community/odrl/two/vocab/">http://www.w3.org/community/odrl/two/vocab/</a>
+	</dd>
+	<dt id="ODRL-XML"><a href="http://www.w3.org/community/odrl/two/xml/">[ODRL-XML]</a></dt>
+	<dd>
+		R. Iannella (ed.).
+		Open Digital Rights Language (ODRL) Version 2.0 – XML Encoding.
+		Final Specification, W3C ODRL Community Group, 19 April 2012.
+		<a href="http://www.w3.org/community/odrl/two/xml/">http://www.w3.org/community/odrl/two/xml/</a>
+	</dd>
+	<dt id="RDF-PRIMER"><a href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">[RDF-PRIMER]</a></dt>
+	<dd>
+		E. Manola &amp; E. Miller (eds.).
+		RDF Primer.
+		W3C Recommendation, 10 February 2004.
+		<a href="http://www.w3.org/TR/2004/REC-rdf-primer-20040210/">http://www.w3.org/TR/2004/REC-rdf-primer-20040210/</a>
+	</dd>
+	<dt id="TURTLE"><a href="http://www.w3.org/TeamSubmission/turtle/">[TURTLE]</a></dt>
+	<dd>
+		D. Beckett, T. Berners-Lee.
+		Turtle - Terse RDF Triple Language.
+		W3C Team Submission, 28 March 2011.
+		<a href="http://www.w3.org/TeamSubmission/turtle/">http://www.w3.org/TeamSubmission/turtle/</a>
+	</dd>
+</dl>
+
+</body>
+</html>
--- a/2/template21.phtml	Thu Apr 02 12:37:57 2015 +0100
+++ b/2/template21.phtml	Thu Apr 02 12:48:30 2015 +0100
@@ -11,17 +11,17 @@
 	<link rel="alternate" type="text/plain" href="ODRL21.nt">
 	<link rel="alternate" type="application/json" href="ODRL21.json">	
 </head>
-<body>
+<body style="background-image: url('W3C-CG-ODRL-FS.png');">
 <?php print $vocab->htmlHeader(); ?>
 
 <h2 id="sec-status">Status of this document</h2>
-<p>This FINAL DRAFT specification was published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a>. It is not a W3C Standard nor is it on the W3C Standards Track. Please note that under the <a href="http://www.w3.org/community/about/agreements/cla/">W3C Community Contributor License Agreement (CLA)</a> there is a limited opt-out and other conditions apply. Learn more about <a href="http://www.w3.org/community/">W3C Community and Business Groups</a>.</p>
+<p>This FINAL specification was published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a>. It is not a W3C Standard nor is it on the W3C Standards Track. Please note that under the <a href="http://www.w3.org/community/about/agreements/cla/">W3C Community Contributor License Agreement (CLA)</a> there is a limited opt-out and other conditions apply. Learn more about <a href="http://www.w3.org/community/">W3C Community and Business Groups</a>.</p>
 
 <p>The <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> publishes a Final Specification to indicate that the document is believed to be mature and stable for implementation by the wider community. This Draft Specification is not yet endorsed by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> as appropriate for widespread deployment and that promotes the Community Groups’s mission.</p>
 
 <p>Discussion and feedback of this document takes place on the W3C ODRL Community Group mailing list (see <a href="http://lists.w3.org/Archives/Public/public-odrl-contrib/">Contributor Archive</a>). Feedback from the public is encouraged and can be send to <a href="mailto:[email protected]">[email protected]</a> (see <a href="http://lists.w3.org/Archives/Public/public-odrl/">Public Archive</a>).</p>
 
-<p>Copyright © 2014 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
+<p>Copyright © 2015 the Contributors to the Final Specification, published by the <a href="http://www.w3.org/community/odrl/">W3C ODRL Community Group</a> under the <a href="http://www.w3.org/community/about/agreements/final/">W3C Community Final Specification Agreement (FSA)</a>. A human-readable summary is <a href="http://www.w3.org/community/about/agreements/fsa-deed/">available</a>.</p>
 
 <h2 id="sec-ns">Namespace URI</h2>
 <p>
--- a/classes.php	Thu Apr 02 12:37:57 2015 +0100
+++ b/classes.php	Thu Apr 02 12:48:30 2015 +0100
@@ -125,6 +125,7 @@
     class Phpspecgen_Vocab extends EasyRdf_Resource
     {
     	public $revision = null;
+		public $basename = null;
 
         protected function propertyDefinition($title, $property) {
             $values = $this->all($property);
@@ -155,8 +156,12 @@
             $html .= "<em>".htmlspecialchars($this->get('dc:description|dc11:description|rdfs:comment'))."</em>\n";
 
             $html .= "<dl>\n";
-            $html .= "<dt>Latest Version</dt><dd>".$this->htmlLink()."</dd>\n";
-            $html .= $this->propertyDefinition('Created', 'dc:created|dc11:created');
+			if(strlen($this->basename))
+           	{
+           		$html .= "<dt>This version</dt><dd><a href=\"" . $this->uri . $this->basename . "\">" . $this->uri . $this->basename . "</a></dd>\n";
+           	}
+           	$html .= "<dt>Latest version</dt><dd>".$this->htmlLink()."</dd>\n";
+           	$html .= $this->propertyDefinition('Created', 'dc:created|dc11:created');
             $html .= $this->propertyDefinition('Date', 'dc:date|dc11:date|dc:issued|dc11:issued');
             $html .= $this->propertyDefinition('Revision', 'owl:versionInfo');
             $html .= $this->propertyDefinition('Authors', 'foaf:maker|dc:creator|dc11:creator');
--- a/phpspecgen.php	Thu Apr 02 12:37:57 2015 +0100
+++ b/phpspecgen.php	Thu Apr 02 12:48:30 2015 +0100
@@ -16,16 +16,21 @@
 require_once(dirname(__FILE__) . '/classes.php');
 
 $err = fopen('php://stderr', 'w');
-if(count($argv) < 3 || count($argv) > 4)
+if(count($argv) < 3 || count($argv) > 5)
 {
-	fprintf($err, "Usage: %s FILE.ttl URI [TEMPLATE]\n", $argv[0]);
+	fprintf($err, "Usage: %s FILE.ttl URI [BASENAME [TEMPLATE]]\n", $argv[0]);
 	exit(1);
 }
 
 $template = 'template.phtml';
-if(count($argv) == 4)
+$basename = null;
+if(count($argv) > 3)
 {
-	$template = $argv[3];
+	$basename = $argv[3];
+}
+if(count($argv) > 4)
+{
+	$template = $argv[4];
 }
 
 # Extra namespaces we use
@@ -37,6 +42,7 @@
 $graph = new EasyRdf_Graph($uri);
 $graph->parseFile($argv[1], 'turtle', $uri);
 $vocab = $graph->get('owl:Ontology', '^rdf:type');
+$vocab->basename = $basename;
 if (!isset($vocab))
 {
 	fprint($err, "%s: No OWL ontologies defined at that URL.\n", $argv[0]);