Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in 3.0.1 spec #1087

Merged
merged 8 commits into from
Aug 27, 2024
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
2 changes: 1 addition & 1 deletion docs/annexes/spdx-license-expressions.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Sometimes license texts are found with additional text, which might or might not

In this case, use the binary "WITH" operator to construct a new license expression to represent the special situation. A valid `<license-expression>` is where the left operand is a `<simple-expression>` value and the right operand is a `<addition-expression>` that represents the additional text.

The `<addition-expression>` can be either a `<license-exception-id>` from the SPDX License List, or a user defined addition reference in the form ["DocumentRef-"(idstring)":"]"AdditonRef-"(idstring)
The `<addition-expression>` can be either a `<license-exception-id>` from the SPDX License List, or a user defined addition reference in the form ["DocumentRef-"(idstring)":"]"AdditionRef-"(idstring)

For example, when the Bison exception is to be applied to GPL-2.0-or-later, the expression would be:

Expand Down
31 changes: 16 additions & 15 deletions docs/conformance.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ the SPDX community, it has been preserved in this specification.

Profile is the term for a compliance point within the SPDX community across The
Linux Foundation and OMG. The System Package Data Exchange (SPDX) specification
defines the following six compliance points, defined as “Profiles”:
defines the following nine compliance points, defined as “Profiles”:

- Core and Software Profiles
- Core Profile
- Software Profile
- Security Profile
- Licencing Profile
- Licensing Profile
- Dataset Profile
- AI Profile
- Build Profile
Expand Down Expand Up @@ -69,7 +70,7 @@ conform with one of the SPDX serialization formats defined SPDX serialization
formats.

Conformance to the Software Profile compliance point does not entail support
for the Licencing, Dataset, AI, Build, Lite, or Extension profiles of the
for the Licensing, Dataset, AI, Build, Lite, or Extension profiles of the
SPDX.

This compliance point, in combination with the Core Profile compliance point,
Expand All @@ -91,17 +92,17 @@ mechanism to express how a vulnerability may affect a specific software element
including if a fix is available.

Conformance to the Security Profile compliance point does not entail support
for the Licencing, Dataset, AI, Build, Lite, or Extension profiles of the
for the Licensing, Dataset, AI, Build, Lite, or Extension profiles of the
SPDX.

This compliance point facilitates interchange of the security information
produced by tools supporting SPDX.

## Licencing Profile compliance point <a name="5.6"></a>
## Licensing Profile compliance point <a name="5.6"></a>

The Licensing Profile includes capturing details relevant to software licensing
and intellectual property information when producing or consuming SPDX content.
Specifically, software that conforms to the SPDX specification at the Licencing
Specifically, software that conforms to the SPDX specification at the Licensing
profile compliance point shall be able to import and export serialized
documents that conform with one of the SPDX serialization formats defined SPDX
serialization formats, including the classes and fields that comprise the SPDX
Expand All @@ -113,11 +114,11 @@ and the ExpandedLicensing profiles.
Both allow expression of the same information,
albeit in different ways.

Conformance to the Licencing Profile compliance point does not entail support
Conformance to the Licensing Profile compliance point does not entail support
for the Software, Security, Dataset, AI, Build, Lite, or Extension profiles of
the SPDX.

This compliance point facilitates interchange of the licencing documents
This compliance point facilitates interchange of the licensing documents
expressing which licenses and copyright notices are determined by persons or
automated tooling to apply to distributions of software that are produced by
tools supporting SPDX.
Expand All @@ -139,7 +140,7 @@ and properties of a dataset, helping users understand and analyze the data more
effectively.

Conformance to the Dataset Profile compliance point does not entail support
for the Software, Licencing, Security, AI, Build, Lite, or Extension profiles
for the Software, Licensing, Security, AI, Build, Lite, or Extension profiles
of the SPDX.

This compliance point facilitates interchange of the information about
Expand All @@ -162,7 +163,7 @@ information about their versions, licenses, and useful security references
including ethical and security information.

Conformance to the AI Profile compliance point does not entail support for the
Software, Licencing, Security, Dataset, Build, Lite, or Extension profiles of
Software, Licensing, Security, Dataset, Build, Lite, or Extension profiles of
the SPDX.

This compliance point facilitates interchange of the AI model related
Expand All @@ -182,7 +183,7 @@ procedures/instructions, environments and actors from the build process along
with the associated evidence.

Conformance to the Build Profile compliance point does not entail support for
the Software, Licencing, Security, Dataset, AI, Lite, or Extension profiles of
the Software, Licensing, Security, Dataset, AI, Lite, or Extension profiles of
the SPDX.

This compliance point facilitates interchange of the build information produced
Expand All @@ -201,10 +202,10 @@ formats, including creation of the SBOM, package lists with licensing and other
related items, and their relationships.

Conformance to the Lite Profile compliance point does not entail support for
the Software, Licencing, Security, Dataset, AI, Build, or Extension profiles
the Software, Licensing, Security, Dataset, AI, Build, or Extension profiles
of the SPDX.

This compliance point facilitates interchange of minimal licencing information
This compliance point facilitates interchange of minimal licensing information
when produced by tools supporting SPDX.

## Extension Profile compliance point <a name="5.11"></a>
Expand Down Expand Up @@ -242,7 +243,7 @@ formats, including the abstract Extension class serving as the base for all
defined Extension subclasses.

Conformance to the Extension Profile compliance point does not entail support
for the Licencing, Security, Dataset, AI, Build, or profiles of the SPDX but
for the Licensing, Security, Dataset, AI, Build, or profiles of the SPDX but
is expected to be used in combination with the other profiles to extend them.

This compliance point facilitates interchange of extended information that goes
Expand Down
29 changes: 15 additions & 14 deletions docs/symbols.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,39 @@ List of symbols/abbreviations.

| | |
|-|-|
| 3T-SBOM | Tool-to-Tool Software Bill of Material |
| 3T-SBOM | Tool-to-Tool Software Bill of Materials Exchange |
| ABNF | Augmented Backus–Naur form |
| AI | Artificial Intelligence |
| BNF | Backus–Naur form |
| BOM | Bill of Material |
| CISA | Cybersecurity and Information Security Agency |
| CISQ | Center for Information and Security Quality |
| CPE | Common Package Enumeration |
| CVE | Common Vulnerabilies and Exposures |
| BOM | Bill of Materials |
| CISA | Cybersecurity and Infrastructure Security Agency |
| CISQ | Consortium for Information & Software Quality |
| CPE | Common Platform Enumeration |
| CVE | Common Vulnerabilities and Exposures |
| CVSS | Common Vulnerability Scoring System |
| EPSS | Exploit Prediction Scoring System |
| ISO | International Organization for Standardization |
| JSON-LD | JavaScript Object Notation for Linked Data |
| JSON-LD | JavaScript Object Notation for Linking Data |
| KEV | Known Exploited Vulnerabilities |
| ML | Machine Learning |
| NISTIR | National Institute of Standards and Technology Internal/Interagency Reports |
| NIST | National Institute of Standards and Technology |
| NISTIR | NIST Internal or Interagency Report |
| NTIA | National Telecommunications and Information Administration |
| OSI | Open Source Initiative |
| OWL | Web Ontology Language |
| PAS | Publicly Available Specification |
| POSIX | Portable Operating System Interface |
| PTF | Platform Task Force |
| PURL | Package Uniform Resource Identifier |
| PURL | Package URL |
| RDF | Resource Description Framework |
| RFC | Request For Comment |
| SBOM | Software Bill of Material |
| RFC | Request For Comments |
| SBOM | Software Bill of Materials |
| SHA | Secure Hash Algorithms |
| SHACL | Shapes Constraint Language |
| SPDX | System Package Data Exchange (previously Software Package Data Exchange) |
| SSVC | Stakeholder- Specific Vulnerability Categorization |
| SWHID | SoftWare Heritage persistent IDentifiers |
| SSVC | Stakeholder-Specific Vulnerability Categorization |
| SWHID | SoftWare Hash IDentifier |
| URI | Uniform Resource Identifier |
| URL | Uniform Resource Locator |
| VEX | Vulnerability Exploitable eXchange |
| VEX | Vulnerability Exploitability eXchange |
| XML | Extensible Markup Language |