Merge branch 'development/v3.0.1' into add-chap-conformance

docs/annexes/license-matching-guidelines-and-templates.md

@@ -48,7 +48,7 @@ The following XML tag is used to implement this guideline. `<alt>` with 2 attrib
 The original text is enclosed within the beginning and ending alt tags.
 
 For example:
-`<alt match="(?i:copyright.{0,200})." name="copyright1">Copyright Linux Foundation</alt>`
+`<alt match="(?i:copyright.{0,200})." name="copyright1">Copyright The Linux Foundation</alt>`
 
 The original replaceable text appears on the SPDX License List webpage in red text.
 
@@ -184,7 +184,7 @@ Ignore copyright notices. A copyright notice consists of the following elements,
 
 The following XML tag is used to implement this guideline: `<copyrightText>`
 
-For example: `<copyrightText>Copyright 2022 Linux Foundation</copyrightText>`
+For example: `<copyrightText>Copyright 2022 The Linux Foundation</copyrightText>`
 
 ## C.12 License name or title <a name="C.12"></a>
 

docs/index.md

@@ -1,12 +1,36 @@
-# The System Package Data Exchange® (SPDX®) Specification Version 3.0
+# The System Package Data Exchange® (SPDX®) Specification Version 3.0.1
 
-Copyright © 2010-2024 Linux Foundation and its Contributors.
+Copyright © 2010-2024, The Linux Foundation and its Contributors,
+including SPDX Model contributions from OMG and its Contributors.
+
+## Use of Specification - Terms, Conditions & Notices
 
 This work is licensed under the
-Community Specification License 1.0 (Community-Spec-1.0).
-Pre-existing portions of this work from copyright holders who have not subsequently contributed under the Community-Spec-1.0 are provided under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0).
+[Community Specification License 1.0](./licenses/Community-Spec-1.0.md)
+(Community-Spec-1.0).
+Pre-existing portions of this work from copyright holders who have not
+subsequently contributed under the Community-Spec-1.0 are provided under
+[Creative Commons Attribution License 3.0 Unported](./licenses/CC-BY-3.0.md)
+(CC-BY-3.0).
 Copies of these licenses are reproduced in their entirety herein.
 
+### Trademarks
+
+SPDX® is a registered trademark of The Linux Foundation.
+
+### Compliance
+
+Use of the SPDX trademarks is subject to the SPDX Trademark License,
+currently available at
+[SPDX Legal Notices page](https://spdx.dev/about/legal-notices/).
+
+Software developed under the terms of the licenses under which this
+specification is issued may claim compliance or conformance with this
+specification if and only if the software provider complies with the
+SPDX Trademark License given above.
+
+## Thanks
+
 With thanks to
 Adam Cohn,
 Adolfo García Veytia,

docs/references.md

@@ -63,10 +63,10 @@ The Internet Society Network Working Group,
 *SPDX and RDF Ontology*,
 [http://spdx.org/rdf/ontology/spdx-3-0-1](http://spdx.org/rdf/ontology/spdx-3-0-1)
 
-*SPDX License List*, Linux Foundation,
+*SPDX License List*, The Linux Foundation,
 [https://spdx.org/licenses/](https://spdx.org/licenses/)
 
-*SPDX License Exceptions*, Linux Foundation,
+*SPDX License Exceptions*, The Linux Foundation,
 [https://spdx.org/licenses/exceptions-index.html](https://spdx.org/licenses/exceptions-index.html)
 
 ## 2.2 Non-normative References <a name="2.2"></a>

mkdocs.yml

@@ -1,17 +1,16 @@
 site_name: SPDX v3 Specification
-site_description: The System Package Data Exchange (SPDX) Specification Version 3.0.1 (DRAFT)
-site_author: Linux Foundation and its Contributors
-site_url: https://spdx.github.io/spdx-spec/v3.0.1-draft/
-# site_url: https://spdx.github.io/spdx-spec/v3.0.1/  # for the final version
+site_description: The System Package Data Exchange (SPDX) Specification Version 3.0.1
+site_author: The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
+site_url: https://spdx.github.io/spdx-spec/
 repo_url: https://github.com/spdx/spdx-spec/
 edit_uri: ""  # set to an empty string to disable edit links; to enable, set to blob/development/v3.0.1/docs/
-copyright: DRAFT -- v3.0.1 -- DRAFT
+copyright: SPDX v3.0.1 Copyright © 2010-2024, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
 use_directory_urls: true
 theme: readthedocs
 plugins:
 - search
 - mike:
-    canonical_version: latest  # tell search engines to prefer the latest version
+    canonical_version: v3.0.1  # tell search engines to prefer the latest version
 - pdf-export:
     combined: true
     media_type: print

setup.py

@@ -11,8 +11,8 @@ def read(fname):
 
 setup(
     name = "spdx_specification",
-    version = "3.0",
-    author = "Linux Foundation and SPDX Contributors",
+    version = "3.0.1",
+    author = "The Linux Foundation and SPDX Contributors",
     author_email = "spdx-tech@lists.spdx.org",
     description = ("The System Package Data Exchange (SPDX®) specification is an open standard capable of representing systems with software components in as SBOMs (Software Bill of Materials) and other AI, data and security references supporting a range of risk management use cases."),
     license = "Community-Spec-1.0 AND CC-BY-3.0 AND MIT",