Updated Conflict section (Simon’s PDF comments)

w3c · Feb 10, 2017 · d33da62 · d33da62
1 parent f5122a7
commit d33da62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/model/config.js b/model/config.js
@@ -1,7 +1,7 @@
 var respecConfig = {
         specStatus: "ED",
         shortName:  "odrl-model",
-        publishDate:          "2017-02-09",
+        publishDate:          "2017-02-10",
         editors: [
             {   name:       "Renato Iannella",
                     url:        "https://au.linkedin.com/in/riannella",

diff --git a/model/index.html b/model/index.html
@@ -381,10 +381,13 @@ <h4>Policy Conflict</h4>
 
 <p>The processing model for Policies conflict strategies includes:</p>
     <ol>
-     <li>If a Policy has the <code>conflict</code> attribute of <code>perm</code> and there are detected conflicts between a Permission and a Prohibition, then the Permission MUST overide the Prohibition.</li>
- <li>If a Policy has the <code>conflict</code> attribute of <code>prohibit</code> and there are detected conflicts between a Permission and a Prohibition, then the Prohibition MUST overide the Permission.</li>
-  <li>If a Policy has the <code>conflict</code> attribute of <code>invalid</code> and there are detected conflicts between a Permission and a Prohibition, then the entire Policy MUST be processed as invalid .</li> 
- <li>If a Policy has multiple <code>conflict</code> attribute values (for example, after a Policy merge) AND there are detected conflicts between a Permission and a Prohibition, then the entire Policy MUST be processed as invalid .</li> 
+        <li>If a ODRL processor does not detect any conflicts in the Rules, then the ODRL Policy is valid, otherwise the ODRL processor MUST follow:</li>
+        <ol>
+           <li>If a Policy has the <code>conflict</code> attribute of <code>perm</code> then any conflicting Permission Rule MUST overide the Prohibition Rule and continue with the Policy as valid.</li>
+ <li>If a Policy has the <code>conflict</code> attribute of <code>prohibit</code> then any conflicting Prohibition Rule MUST overide the Permission Rule and continue with the Policy as valid.</li>
+  <li>If a Policy has the <code>conflict</code> attribute of <code>invalid</code> then  processing MUST not continue and the entire Policy MUST be invalid.</li> 
+ <li>If a Policy has multiple <code>conflict</code> attribute values (for example, after a Policy merge or inheritance) then  processing MUST not continue and the entire Policy MUST be invalid.</li> 
+        </ol>
     </ol>