Merge pull request #457 from w3c/issue-166-update-uml

Update SHACL UML diagram to include additional features

Author: YoucTagh

shacl12-core/index.html

@@ -1117,7 +1117,8 @@ <h2>Shapes and Constraints</h2>
 			<p>
 				The following informal diagram provides an overview of some of the key classes in the SHACL vocabulary.
 				Each box represents a class.
-				The content of the boxes under the class name lists some of the properties that instances of these classes may have, together with their value types.
+				The boxes under the class name list a small subset of the frequently used properties
+				that instances of these classes may have, together with their value types.
 				The arrows indicate <code>rdfs:subClassOf</code> triples.
 			</p>
 			<div>
@@ -1147,7 +1148,7 @@ <h2>Shapes and Constraints</h2>
 						<div class="diagram-class-properties-start">
 							<div><b><a href="#constraints">Constraint parameters</a></b>, for example:</div>
 							<div><a href="#ClosedConstraintComponent">sh:closed</a> : xsd:boolean or sh:ByTypes</div>
-							<div><a href="#OrConstraintComponent">sh:or</a> : rdf:List</div>
+							<div><a href="#OrConstraintComponent">sh:or</a>, <a href="#AndConstraintComponent">sh:and</a>, <a href="#XoneConstraintComponent">sh:xone</a> : rdf:List</div>
 							<div><a href="#NotConstraintComponent">sh:not</a> : sh:Shape</div>
 							<div><a href="#PropertyConstraintComponent">sh:property</a> : sh:PropertyShape</div>
 						</div>
@@ -1159,13 +1160,15 @@ <h2>Shapes and Constraints</h2>
 						<div class="diagram-class-properties-start">
 							<div><b><a href="#constraints">Constraint parameters</a></b>, for example:</div>
 							<div><a href="#MinCountConstraintComponent">sh:minCount</a>, <a href="#MaxCountConstraintComponent">sh:maxCount</a> : xsd:integer</div>
-							<div><a href="#ClassConstraintComponent">sh:class</a> or <a href="#DatatypeConstraintComponent">sh:datatype</a> : rdfs:Resource</div>
+							<div><a href="#MinLengthConstraintComponent">sh:minLength</a>, <a href="#MaxLengthConstraintComponent">sh:maxLength</a> : xsd:integer</div>
+							<div><a href="#ClassConstraintComponent">sh:class</a> or <a href="#DatatypeConstraintComponent">sh:datatype</a> : rdfs:Resource or rdf:List of rdfs:Resources</div>
 							<div><a href="#NodeConstraintComponent">sh:node</a> : sh:NodeShape</div>
 						</div>
 						<div class="diagram-class-properties-section">
 							<div><a href="#name">sh:name</a> : xsd:string or rdf:langString</div>
 							<div><a href="#description">sh:description</a> : xsd:string or rdf:langString</div>
 							<div><a href="#syntax-rule-path-defaultValue">sh:defaultValue</a> : any</div>
+							<div><a href="#syntax-rule-path-defaultValue">sh:values</a> : any</div>
 							<div><a href="#group">sh:group</a> : sh:PropertyGroup</div>
 						</div>
 						<div class="diagram-class-properties-section">