Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -53,7 +53,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 The Linux Foundation</alt>`
`<alt match="[Cc]opyright.{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 @@ -258,7 +258,7 @@ the more expressive XML format.
A legacy template is composed of text with zero or more rules embedded in it.

A rule is a variable section of a license wrapped between double angle brackets
`<<>>` and is composed of 4 fields.
`<<>>` and is composed of either 2 or 4 fields.
Each field is separated with a semi-colon `;`.
Rules shall not be embedded within other rules.
Rule fields begin with a case sensitive tag followed by an equal sign `=`.
Expand Down
2 changes: 1 addition & 1 deletion docs/annexes/rdf-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Model definition

The SPDX RDF ontology is expressed in RDF/OWL/SHACL format
and is published in online at
and is published online at
[SPDX 3.0 model](https://spdx.org/rdf/3.0/spdx-model.ttl)

## Diagrams
Expand Down
15 changes: 7 additions & 8 deletions docs/annexes/spdx-license-expressions.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ An example where three different licenses apply would be:
LGPL-2.1-only AND MIT AND BSD-2-Clause
```

The "AND" operator is the only operator that can be used in conjuction with the special identifiers "NONE" or "NOASSERTION".
The "AND" operator is the only operator that can be used in conjunction with the special identifiers "NONE" or "NOASSERTION".

### Additive "WITH" operator

Expand Down Expand Up @@ -195,7 +195,7 @@ is described by the following ABNF:
```ABNF
; ABNF Grammar for License Expressions

SPSX-license-expression = (or-operand *( required-ws "OR" required-ws or-operand )) / special-identifier
SPDX-license-expression = (or-operand *( required-ws "OR" required-ws or-operand )) / special-identifier

or-operand = (term required-ws "AND" required-ws term *( required-ws "AND" required-ws term )) / base-term

Expand All @@ -211,7 +211,7 @@ identifier = license-id / or-later-expression / license-ref

or-later-expression = license-id PLUS

parenthesized-expression = LPAREN optional-ws expression optional-ws RPAREN
parenthesized-expression = LPAREN optional-ws SPDX-license-expression optional-ws RPAREN

special-identifier = "NONE" / "NOASSERTION"

Expand All @@ -225,7 +225,7 @@ license-exception-id = <short form license exception identifier from SPDX Licens
license-ref = [ "DocumentRef-" idstring ":" ] "LicenseRef-" idstring
addition-ref = [ "DocumentRef-" idstring ":" ] "AdditionRef-" idstring

idstring = *id-char alnum *id-char
idstring = *idchar alnum *idchar
idchar = alnum / DOT / DASH
alnum = ALPHA / DIGIT

Expand All @@ -237,11 +237,10 @@ required-ws = 1*SPACE ; Required whitespace (one or more spaces)
SPACE = %x20 ; Space character
LPAREN = %x28 ; ( - Left parenthesis
RPAREN = %x29 ; ) - Right parenthesis
PLUS = %2B ; + - Plus
DASH = %2D ; - - Dash, hyphen
DOT = %2E ; . - Dot, fullstop, period
PLUS = %x2B ; + - Plus
DASH = %x2D ; - - Dash, hyphen
DOT = %x2E ; . - Dot, fullstop, period

ALPHA = %x41-5A / %x61-7A ; A-Z / a-z
DIGIT = %x30-39 ; 0-9

```
8 changes: 4 additions & 4 deletions docs/annexes/spdx-lite.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ as an SPDX document in the software supply chain.

## Mandatory and recommended properties

The Lite profile specifies that some properties shall be present
and some others should be present, as much as possible.
The Lite profile specifies that some properties shall be present,
and some others should be present as much as possible.

The following lists collect and present this information
for every class present in the SPDX data,
Expand Down Expand Up @@ -70,7 +70,7 @@ The lists of properties are in alphabetical order, for easy reference.
1. builtTime
1. comment
1. downloadLocation
1. homepage
1. homePage
1. originatedBy (may be multiple), should be objects of type /Core/Agent
1. packageUrl
1. releaseTime
Expand Down Expand Up @@ -144,7 +144,7 @@ Additionally:
1. externalIdentifierType
1. identifier

### /Core/NameSpaceMap
### /Core/NamespaceMap

- Mandatory
1. namespace
Expand Down
2 changes: 1 addition & 1 deletion docs/front/copyright.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Use of specification — terms, conditions and notices

Copyright © 2010–2025, The Linux Foundation and its Contributors,
Copyright © 2010–2026, The Linux Foundation and its Contributors,
including SPDX Model contributions from OMG and its Contributors.

This work is licensed under the
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The System Package Data Exchange™ (SPDX®) Specification Version 3.0

Copyright © 2010–2025, The Linux Foundation and its Contributors,
Copyright © 2010–2026, The Linux Foundation and its Contributors,
including SPDX Model contributions from OMG and its Contributors.

With thanks to
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ site_author: The Linux Foundation and its Contributors, including SPDX Model con
site_url: https://spdx.github.io/spdx-spec/ # set to the "root" of the site, to be combined with canonical_version
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: SPDX 3.0 Copyright © 2010-2025, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
copyright: SPDX 3.0 Copyright © 2010-2026, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
use_directory_urls: true
theme:
name: readthedocs
Expand Down
Loading