Skip to content

Commit

Permalink
Merge branch 'development/v3.0.1' into validate-examples-only-with-md…
Browse files Browse the repository at this point in the history
…-files
  • Loading branch information
kestewart authored Aug 10, 2024
2 parents 020771d + 1f9518e commit 7823a10
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/annexes/license-matching-guidelines-and-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions docs/references.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 7823a10

Please sign in to comment.