Merge branch 'gh-pages' into shacl12-overview

Author: nicholascar

shacl12-core/index.html

@@ -1771,6 +1771,14 @@ <h4>Declaring the Severity of a Shape or Constraint</h4>
 							<th>Severity</th>
 							<th>Description</th>
 						</tr>
+						<tr>
+							<td><code>sh:Trace</code></td>
+							<td>A trace message that is not a violation.</td>
+						</tr>
+						<tr>
+							<td><code>sh:Debug</code></td>
+							<td>A debug message that is not a violation.</td>
+						</tr>
 						<tr>
 							<td><code>sh:Info</code></td>
 							<td>A non-critical constraint violation indicating an informative message.</td>
@@ -1784,6 +1792,10 @@ <h4>Declaring the Severity of a Shape or Constraint</h4>
 							<td>A constraint violation.</td>
 						</tr>
 					</tbody></table>
+					<p>
+						Validation engines MAY treat <code>sh:Info</code> and <code>sh:Warning</code> as non-violating based on
+						options passed to the engine. By default, they are treated as violations.
+					</p>
 					<p>
 						In addition to declaring severities per shape, the property <code>sh:severity</code> can also be used
 						on a <a>reifier</a> for a triple where the <a>shape</a> is the <a>subject</a> and one of the <a>parameters</a>
@@ -2843,7 +2855,7 @@ <h4>Handling of Recursive Shapes</h4>
 				<h3>Conformance Checking</h3>
 				<p>
 					A <a>focus node</a> <dfn data-lt="conform|conformance">conforms</dfn> to a <a>shape</a> if and only if
-					the set of result of the <a>validation</a> of the <a>focus node</a> against the <a>shape</a> is empty and no <a>failure</a>
+					the set of result of the <a>validation</a> of the <a>focus node</a> against the <a>shape</a> does not contain any results with a severity level representing a violation and no <a>failure</a>
 					has been reported by it.
 				</p>
 				<p>
@@ -2958,7 +2970,7 @@ <h5>Conforms (sh:conforms)</h5>
 						<p>
 							Each SHACL instance of <code>sh:ValidationReport</code> in the results graph has exactly one value for the property <code>sh:conforms</code> and the value is of datatype <code>xsd:boolean</code>.
 							It represents the outcome of the <a>conformance checking</a>.
-							The value of <code>sh:conforms</code> is <code>true</code> if and only if the <a>validation</a> did not produce any <a>validation results</a>, and <code>false</code> otherwise.
+							The value of <code>sh:conforms</code> is <code>true</code> if and only if the <a>validation</a> did not produce any <a>validation results</a> with a severity level representing a violation, and <code>false</code> otherwise.
 						</p>
 					</section>
 					<section id="result">
@@ -7880,6 +7892,8 @@ <h2>Security and Privacy Considerations</h2>
 			</p>
 		</section>
 
+		<section id="index"></section>
+
 		<section id="ack" class="appendix informative">
 			<h2>Acknowledgements</h2>
 			<p>