#648: Moved table of severities below syntax rules, added fallback for sh:message in SPARQL (#667)

* #648: Moved table of severities below syntax rules, added fallback for sh:message in SPARQL

* Fixed typo

* Update shacl12-core/index.html

Co-authored-by: Andy Seaborne <andy@apache.org>

---------

Co-authored-by: Andy Seaborne <andy@apache.org>

Author: HolgerKnublauch

shacl12-core/index.html

@@ -1455,37 +1455,6 @@ <h4>Declaring the Severity of a Shape or Constraint</h4>
 						<span data-syntax-rule="severity-maxCount">Shapes can specify one <a>value</a> for the property <code>sh:severity</code> in the <a>shapes graph</a>.</span>
 						<span data-syntax-rule="severity-nodeKind">Each value of <code>sh:severity</code> is an <a>IRI</a>.</span>
 					</p>
-					<p>
-						The values of <code>sh:severity</code> are called <dfn data-lt="severity">severities</dfn>.
-						SHACL includes the IRIs listed in the table below to represent <a>severities</a>.
-						These are declared in the SHACL vocabulary as SHACL instances of <code>sh:Severity</code>.
-					</p>
-					<table class="term-table">
-						<tbody><tr>
-							<th>Severity</th>
-							<th>Description</th>
-						</tr>
-						<tr>
-							<td><code>sh:Trace</code></td>
-							<td>A trace message that is not a constraint violation.</td>
-						</tr>
-						<tr>
-							<td><code>sh:Debug</code></td>
-							<td>A debug message that is not a constraint violation.</td>
-						</tr>
-						<tr>
-							<td><code>sh:Info</code></td>
-							<td>A non-critical constraint violation indicating an informative message.</td>
-						</tr>
-						<tr>
-							<td><code>sh:Warning</code></td>
-							<td>A non-critical constraint violation indicating a warning.</td>
-						</tr>
-						<tr>
-							<td><code>sh:Violation</code></td>
-							<td>A constraint violation.</td>
-						</tr>
-					</tbody></table>
 					<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>
@@ -1497,6 +1466,39 @@ <h4>Declaring the Severity of a Shape or Constraint</h4>
 						A <a>shapes graph</a> can specify at most one <a>value</a> for the property <code>sh:severity</code>
 						in the <a>reifiers</a> of the <a>triples</a> in <code>T</code>.
 					</span></p>
+					<p>
+						A value of <code>sh:severity</code> is called a <dfn>severity</dfn>.
+						SHACL includes the IRIs listed in the table below to represent [=severities=].
+						These are declared in the SHACL vocabulary as SHACL instances of <code>sh:Severity</code>.
+					</p>
+					<table class="term-table">
+						<tbody>
+							<tr>
+								<th>Severity</th>
+								<th>Description</th>
+							</tr>
+							<tr>
+								<td><code>sh:Trace</code></td>
+								<td>A trace message that is not a constraint violation.</td>
+							</tr>
+							<tr>
+								<td><code>sh:Debug</code></td>
+								<td>A debug message that is not a constraint violation.</td>
+							</tr>
+							<tr>
+								<td><code>sh:Info</code></td>
+								<td>A non-critical constraint violation indicating an informative message.</td>
+							</tr>
+							<tr>
+								<td><code>sh:Warning</code></td>
+								<td>A non-critical constraint violation indicating a warning.</td>
+							</tr>
+							<tr>
+								<td><code>sh:Violation</code></td>
+								<td>A constraint violation.</td>
+							</tr>
+						</tbody>
+					</table>
 					<p><em>The remainder of this section is informative.</em></p>
 					<p>
 						The validation process handles the values of <code>sh:severity</code> according to <a>conformance checking</a>.

shacl12-sparql/index.html

@@ -853,6 +853,9 @@ <h4>Mapping of Solution Bindings to Result Properties</h4>
 									<li>
 										For SPARQL-based constraint components: The values of <code>sh:message</code> of the <a>SPARQL-based constraint component</a>.
 									</li>
+									<li>
+										The default mechanisms for <a data-cite="shacl12-core/#message">declaring messages</a> at the shape or constraint apply otherwise.
+									</li>
 								</ol>
 								<div>
 									These message literals may include the names of any SELECT result variables via <code>{?varName}</code> or <code>{$varName}</code>.