Merge branch 'gh-pages' of https://github.com/w3c/poe into gh-pages

model/config.js

@@ -1,7 +1,7 @@
 var respecConfig = {
-        specStatus:              "CR",
+        specStatus:              "ED",
         shortName:               "odrl-model",
-        publishDate:             "2017-09-26",
+        //publishDate:             "2017-09-26",
         crEnd:                   "2017-11-14",
         implementationReportURI: "https://w3c.github.io/poe/test/implementors",
         editors: [

model/index.html

@@ -1091,7 +1091,7 @@ <h3>Prohibition Class</h3>
 <section id="duty">
 <h3>Duty Class</h3>
 
-<p>A Duty is the <strong>obligation</strong> to <strong>exercise</strong> an  action, with all refinements <strong>satisfied</strong>. A Duty is <strong>fulfilled</strong> if all constraints are <strong>satisfied</strong> and if its action, with all refinements <strong>satisfied</strong>, has been <strong>exercised</strong>. If its action has not been exercised, then all <code>consequence</code>s must be fulfilled to fulfil the Duty. (Note: only Duties referenced by duty or obligation properties may use consequence properties.)
+<p>A Duty is the <strong>obligation</strong> to <strong>exercise</strong> an  action, with all refinements <strong>satisfied</strong>. A Duty is <strong>fulfilled</strong> if all constraints are <strong>satisfied</strong> and if its action, with all refinements <strong>satisfied</strong>, has been <strong>exercised</strong>. If its action has not been exercised, then all <code>consequence</code>s must also be fulfilled to fulfil the Duty. That is, the consequence is an <em>additional</em> Duty that must also be fulfilled. (Note: only Duties referenced by duty or obligation properties may use consequence properties.)
 	</p>
 
 
@@ -1112,9 +1112,16 @@ <h3>Duty Class</h3>
 		<li>The assignee(s) of the Duty MUST satisfy the Duty.</li>
 	</ul>
 
-<p>The <code>consequence</code> property (a sub-property of the <code><em>failure</em></code> property) is utilised to express the repercussions of not fulfilling an agreed Policy obligation or duty for a Permission. If either of these fails to be fulfilled, then this will result in the consequence Duty <em>also</em> becoming a new requirement, meaning that the original obligation or duty, as well as the consequence Duty MUST all be <strong>fulfilled</strong>. For example, if an obligation to provide data by a certain date is not fulfilled, the a consequence of a $100 fine is payable as well.
+<p>The <code>consequence</code> property (a sub-property of the <code><em>failure</em></code> property) is utilised to express the repercussions of not fulfilling an agreed Policy obligation or duty for a Permission. If either of these fails to be fulfilled, then this will result in the consequence Duty <em>also</em> becoming a new requirement, meaning that the original obligation or duty, as well as the consequence Duty MUST all be <strong>fulfilled</strong>.
 </p>
 
+<div class="note">
+	<p>In some cases, to fulfil the original duty that triggered a consequence, some constraints on the original duty MAY be required to be relaxed if they are no longer able to be satisfied. </p>
+	<p>For example, if an obligation to provide data by a fixed date is not fulfilled, the a consequence of a $100 fine is payable as well. If the date has passed, then the original duty is <em>technically</em> not able to be fulfilled (as the date constraint cannot be satisfied). 
+		<p>In such cases, ODRL implementations SHOULD provide mechanisms to allow the original duty to be satisfiable.</p>
+</div>
+
+
 <p>Note that the consequence property MUST NOT be used on a Duty that is already a consequence for a Permission duty or Policy obligation.</p>
 
 
@@ -1250,7 +1257,7 @@ <h3>Consequence property with a Permission/Obligation Duty</h3>
 		<p>The <code>consequence</code> property is a sub-property of the <code><em>failure</em></code> property. See the <a href="#duty">Duty Class </a> section for more about the consequence property.</p>
 
 <blockquote>
-<p>Example Use Case: The below Agreement between assigner <code>http://example.com/org:99</code> and assignee <code>http://example.com/person:88</code> allows the assignee to distribute the Asset <code>http://example.com/data:77</code> under the pre-condition they attribute the asset to Party <code>http://australia.gov.au/</code>. If the assignee does not fulfill the duty, or distributes the asset without fulfilling the duty, then the consequence will be that they will also be tracked by <code>http://example.com/dept:100</code>.</p>
+<p>Example Use Case: The below Agreement between assigner <code>http://example.com/org:99</code> and assignee <code>http://example.com/person:88</code> allows the assignee to distribute the Asset <code>http://example.com/data:77</code> under the pre-condition they attribute the asset to Party <code>http://australia.gov.au/</code>. If the assignee does not fulfil the duty, or distributes the asset without fulfilling the duty, then the consequence will be that they will also be tracked by <code>http://example.com/dept:100</code>.</p>
     </blockquote>
 
 
@@ -1964,6 +1971,13 @@ <h3>Changes from Previous Versions</h3>
 	<li>Added Refinement property <a href="https://github.com/w3c/poe/issues/211">(Issue#211)</a></li>
 
 </ul>
+
+    <p>Changes from the <a href="https://www.w3.org/TR/2017/CR-odrl-vocab-20170926//">Candidate Recommendation 26 September 2017</a>:</p>
+    <ul>
+    	<li>Added explanation on satisfying duties that have triggered a consequence <a href="https://github.com/w3c/poe/issues/267">(Issue#267)</a> <a href="https://github.com/w3c/poe/issues/275">(Issue#275)</a> </li>
+
+    </ul>
+
 </section>
 
 </body>

vocab/ODRL22.ttl

@@ -799,7 +799,7 @@ odrl:
     rdfs:subPropertyOf :failure ;
 	rdfs:label "Consequence"@en ;
 	skos:definition "Relates a Duty to another Duty, the latter being a consequence of not fulfilling the former."@en ;
-	skos:note "The consequence property is utilised to express the repercussions of not fulfilling an agreed obligation (for a Policy) or duty (for a Permission)."@en ;
+	skos:note "The consequence property is utilised to express the repercussions of not fulfilling an agreed Policy obligation or duty for a Permission. If either of these fails to be fulfilled, then this will result in the consequence Duty also becoming a new requirement, meaning that the original obligation or duty, as well as the consequence Duty must all be fulfilled"@en ;
 	rdfs:domain :Duty ;
 	rdfs:range :Duty .
 

vocab/parts/changes.html

@@ -71,7 +71,12 @@
 		<li>Added mandatory use of ODRL Profiles <a href="https://github.com/w3c/poe/issues/210">(Issue#210)</a></li>
 
 	<li>Added Refinement property <a href="https://github.com/w3c/poe/issues/211">(Issue#211)</a></li>
-
-
-
-</ul>
+
+
+</ul>
+
+ <p>Changes from the <a href="https://www.w3.org/TR/2017/CR-odrl-vocab-20170926//">Candidate Recommendation 26 September 2017</a>:</p>
+    <ul>
+      <li>Updated note of consequence property <a href="https://github.com/w3c/poe/issues/267">(Issue#267)</a> <a href="https://github.com/w3c/poe/issues/275">(Issue#275)</a> </li>
+
+    </ul>