Merge branch 'update-changelog' of https://github.com/bact/spdx-3-model…

… into update-changelog

docs/model.drawio

@@ -1,6 +1,6 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/25.0.2 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" compressed="false" version="25.0.2" pages="8">
+<mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" compressed="false" version="24.7.17" pages="8">
   <diagram id="MqBy92FNWJOg9jOokCTN" name="Core">
-    <mxGraphModel dx="1669" dy="2573" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="0" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="2241" dy="2747" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="0" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -587,24 +587,36 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-1" value="&lt;b&gt;SemVer&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="1">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-1" value="&lt;b&gt;SemVer&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
           <mxGeometry x="935" y="-26" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-2" value="xsd:string" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" vertex="1" parent="d2XWjltUTtw7Rj8B-aOZ-1">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-2" value="xsd:string" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" parent="d2XWjltUTtw7Rj8B-aOZ-1" vertex="1">
           <mxGeometry y="30" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-6" value="&lt;b&gt;MediaType&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="1">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-6" value="&lt;b&gt;MediaType&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
           <mxGeometry x="935" y="-110.85" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-7" value="xsd:string" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" vertex="1" parent="d2XWjltUTtw7Rj8B-aOZ-6">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-7" value="xsd:string" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" parent="d2XWjltUTtw7Rj8B-aOZ-6" vertex="1">
           <mxGeometry y="30" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-8" value="&lt;b&gt;DateTime&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="1">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-8" value="&lt;b&gt;DateTime&lt;/b&gt;" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
           <mxGeometry x="935" y="-192" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-9" value="xsd:dateTimeStamp" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" vertex="1" parent="d2XWjltUTtw7Rj8B-aOZ-8">
+        <mxCell id="d2XWjltUTtw7Rj8B-aOZ-9" value="xsd:dateTimeStamp" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fontFamily=Verdana;fontSize=10;" parent="d2XWjltUTtw7Rj8B-aOZ-8" vertex="1">
           <mxGeometry y="30" width="120" height="30" as="geometry" />
         </mxCell>
+        <mxCell id="VEI3-CmWlY-LwqXBLSO8-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;entryX=0.227;entryY=1.048;entryDx=0;entryDy=0;fontFamily=Verdana;fontSize=10;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryPerimeter=0;" edge="1" parent="1" source="VEI3-CmWlY-LwqXBLSO8-2" target="PneUqTGE2ykhamjTnd7t-16">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="403" y="-320" />
+              <mxPoint x="439" y="-320" />
+            </Array>
+            <mxPoint x="566.25" y="-255.5" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="VEI3-CmWlY-LwqXBLSO8-2" value="IndividualElement" style="swimlane;fontStyle=1;childLayout=stackLayout;horizontal=1;startSize=26;fillColor=#e1d5e7;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;labelBackgroundColor=none;strokeColor=#9673a6;fontFamily=Verdana;fontSize=10;" vertex="1" parent="1">
+          <mxGeometry x="346.25" y="-281.75" width="113.75" height="52" as="geometry" />
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>

model/Build/Build.md

@@ -55,7 +55,7 @@ class. In addition, there must be at least three instances `Relationship`s with
 type `LifecycleScopedRelationship`, where the "scope" property must be "build"
 and the "from" property must be the Build instance.
 
-At the minimum, the build profile must contain a `hasInput`, `hasOutput`, and
+At the minimum, the Build profile must contain a `hasInput`, `hasOutput`, and
 `invokedBy` relationshipType. If an input is known to be a build configuration
 or a build tool, the `hasInput` relationshipType can be replaced by a
 `configures` or `usesTool` relationshipType.

model/Core/Classes/ElementCollection.md

@@ -11,10 +11,10 @@ A collection of Elements, not necessarily with unifying context.
 An ElementCollection is a collection of Elements, not necessarily with unifying
 context.
 
-Note that all ElementCollections must conform to the core profile even if the
-core profile is not specified in the profileConformance property.
+Note that all ElementCollections must conform to the Core profile even if the
+Core profile is not specified in the profileConformance property.
 
-If the profileConformance property is not provided, core is to be assumed as
+If the profileConformance property is not provided, "core" is to be assumed as
 the default.
 
 *Constraints*

model/Core/Classes/IndividualElement.md

@@ -0,0 +1,21 @@
+SPDX-License-Identifier: Community-Spec-1.0
+
+# IndividualElement
+
+## Summary
+
+A concrete subclass of Element used by Individuals in the
+Core profile.
+
+## Description
+
+Individuals, such as NoneElement and NoAssertionElement, need to reference a
+concrete subclass of Element.
+
+This class provides the type used by the individuals defined in the Core profile.
+
+## Metadata
+
+- name: IndividualElement
+- SubclassOf: Element
+- Instantiability: Concrete

model/Core/Individuals/NoAssertionElement.md

@@ -28,7 +28,7 @@ no assertion is being made about any potential descendants of Element1.
 ## Metadata
 
 - name: NoAssertionElement
-- type: Element
+- type: IndividualElement
 
 ## Property Values
 

model/Core/Individuals/NoneElement.md

@@ -22,7 +22,7 @@ Element1 has no descendants.
 ## Metadata
 
 - name: NoneElement
-- type: Element
+- type: IndividualElement
 
 ## Property Values
 

model/Core/Properties/profileConformance.md

@@ -21,9 +21,9 @@ in the profile specific documentation and schema files.
 Use of this property allows the creator of an ElementCollection to communicate
 to consumers their intent to adhere to the profile additional restrictions.
 
-The profileConformance has a default value of core if no other
+The profileConformance has a default value of "core" if no other
 profileConformance is specified since all ElementCollections and Element must
-adhere to the core profile.
+adhere to the Core profile.
 
 ## Metadata
 

model/Core/Vocabularies/ProfileIdentifierType.md

@@ -11,7 +11,7 @@ Enumeration of the valid profiles.
 There are a set of profiles that have been defined by a profile team.
 
 A profile consists of a namespace that may add properties and classes to the
-core profile unique to the domain covered by the profile.
+Core profile unique to the domain covered by the profile.
 
 The profile may also contain additional restrictions on existing properties and
 classes defined in other profiles.
@@ -28,8 +28,8 @@ to all restrictions defined for that profile.
 
 - core: the element follows the Core profile specification
 - software: the element follows the Software profile specification
-- simpleLicensing: the element follows the simple Licensing profile specification
-- expandedLicensing: the element follows the expanded Licensing profile specification
+- simpleLicensing: the element follows the SimpleLicensing profile specification
+- expandedLicensing: the element follows the ExpandedLicensing profile specification
 - security: the element follows the Security profile specification
 - build: the element follows the Build profile specification
 - ai: the element follows the AI profile specification

model/Licensing/Licensing.md

@@ -12,10 +12,10 @@ facilitate compliance with typical license use cases.
 The Licensing profile only contains the additional requirement that any
 Software Artifact must have a `Relationship` of type `hasConcludedLicense`.
 
-Classes and Property restrictions are defined in the `SimpleLicensingProfile`
+Classes and Property restrictions are defined in the SimpleLicensing Profile
 (Classes and Properties associated with
 [license expression strings](../../annexes/spdx-license-expressions.md))
-and in the `ExpandedLicensingProfile` (Classes and Properties used for a
+and in the ExpandedLicensing Profile (Classes and Properties used for a
 fully parsed syntax tree of license expressions).
 
 There are 2 relationship types related to licensing - `hasDeclaredLicense` and