Skip to content

Commit

Permalink
Update per review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Gary O'Neall <[email protected]>
  • Loading branch information
goneall committed Aug 17, 2023
1 parent d67ce21 commit 9f9e164
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 31 deletions.
4 changes: 2 additions & 2 deletions model/ExpandedLicensing/Individuals/NoAssertionLicense.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ SPDX-License-Identifier: Community-Spec-1.0
# NoAssertionLicense

## Summary
An Individual Value for License when no assertion can be made about it's actual value.
An Individual Value for License when no assertion can be made about its actual value.


## Description

NoAssertion should be used if the SPDX creator has attempted to but cannot reach a reasonable objective determination;
NoAssertionLicense should be used if the SPDX creator has attempted to but cannot reach a reasonable objective determination;
the SPDX creator has made no attempt to determine this field; or
the SPDX creator has intentionally provided no information (no meaning should be implied by doing so).

Expand Down
5 changes: 3 additions & 2 deletions model/ExpandedLicensing/Individuals/NoneLicense.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ SPDX-License-Identifier: Community-Spec-1.0
# NoneLicense

## Summary
An Individual Value for License no license is present.

An Individual Value for License where the SPDX data creator determines that no license is present.


## Description

The SPDX document creator concludes there is no license available for this package
NoneLicense should be used if the SPDX creator determines there is no license available for this Artifact.

## Metadata

Expand Down
50 changes: 23 additions & 27 deletions model/Licensing/Licensing.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ fully parsed syntax tree of license expressions).

There are 2 licensing related relationship types - declaredLicense and concludedLicense.

A declaredLicense is the license identified in text in the software package,
file or snippet as the license declared by its authors.
A declaredLicense identifies the license information actually found in the Software Artifact,
for example as detected by use of automated tooling.

This relationship is not intended to capture license information obtained from an
This field is not intended to capture license information obtained from an
external source, such as a package's website. Such information can be
included, as needed, in a concludedLicense relationship.
included, as needed, in a concludedLicense field.

A declaredLicense may be expressed differently in practice for different
types of Software Artifacts. For example:
Expand All @@ -45,57 +45,53 @@ types of Software Artifacts. For example:
different File (e.g., comment at top of File if it is not within the
Snippet, LICENSE file in the top directory of a repository)

A relationship of type declaredLicense to a NoneLicense indicates that the
corresponding Software Artifact contains no license information
A declaredLicense is related to a NoneLicenseindicates that the
corresponding Package, File or Snippet contains no license information
whatsoever.

A relationship of type declaredLicense to a NoAssertionLicense
A declaredLicense related to aNoAssertionLicense
indicates that one of the following applies:
* the SPDX data creator has attempted to but cannot reach a reasonable
objective determination;
* the SPDX data creator has made no attempt to determine this field; or
* the SPDX data creator has intentionally provided no information (no meaning
should be implied by doing so).

If no relationship of type declaredLicense is present, no conclusion can be drawn.
Note that a missing relationship of type declaredLicense is not the same as a
a relationship of type declaredLicense to a NoAssertionLicense
If a declaredLicense relationship is not present, no conclusion can be drawn.
Note that a missing declaredLicense is not the same as a relationship to a NoAssertionLicense
since the latter is a "known unknown" whereas no conclusion can be drawn
from a missing or null value.


A relationship of type concludedLicense is the license identified by the SPDX data creator,
based on analyzing the license information in the Software Artifact and other information to arrive at a reasonably objective

A concludedLicense is the license identified by the SPDX data creator,
based on analyzing the license information in the Software Artifact
and other information to arrive at a reasonably objective
conclusion as to what license governs it.

A relationship of type concludedLicense to a NoneLicense indicates that the
A concludedLicense related to a NoneLicense indicates that the
SPDX data creator has looked and did not find any license information for this
software Package, File or Snippet.
Software Artifact.

A relationship of type concludedLicense to a NoAssertionLicense
A concludedLicense related to a NoAssertionLicense
indicates that one of the following applies:
* the SPDX data creator has attempted to but cannot reach a reasonable
objective determination;
* the SPDX data creator has made no attempt to determine this field; or
* the SPDX data creator has intentionally provided no information (no
meaning should be implied by doing so).

If a relationship of type concludedLicense is not present, no conclusion can be drawn.
Note that a missing relationship of type concludedLicense is not the same as a
relationship of type concludedLicense to a NoAssertionLicense
If a concludedLicense is not present, no conclusion can be drawn.
Note that a missing or null concludedLicense is not the same as a relationship to a NoAssertionLicense
since the latter is a "known unknown" whereas no conclusion can be drawn
from a missing or null value.

A relationship of type concludedLicense to a NoAssertionLicense MAY
provide a written explanation of choice of the NoAssertionLicense
the comment field for the relationship.

IF the relationship of type concludedLicense points to a different license than
the relationship of type declaredLicense for a given Software Artifact,
a written explanation SHOULD be provided in
the relationship with the concludedLicense type field.
A written explanation of a relationship to a NoAssertionLicense MAY be
provided in the comment field for the relationship.

Note that a relationship of type concludedLicense is required for any Software Artifact.
If the concludedLicense for a Software Artifact is not the
same as its declaredLicense, a written explanation SHOULD be provided in
the concludedLicense relationship comment field.


## Metadata
Expand Down

0 comments on commit 9f9e164

Please sign in to comment.