Skip to content

Commit 40c7636

Browse files
authored
Merge pull request #3023 from nexB/clarify-license-keys
Clarify `unknown` license keys #2827 Contributed-by: Dennis Clark <[email protected]> Signed-off-by: Philippe Ombredanne <[email protected]>
2 parents 1d575e8 + 90b9041 commit 40c7636

9 files changed

+19
-17
lines changed

src/licensedcode/data/licenses/free-unknown.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ category: Unstated License
55
owner: Unspecified
66
is_unknown: yes
77
spdx_license_key: LicenseRef-scancode-free-unknown
8-
8+
notes: This case applies to software with a notice that refers in a non-specific manner to a
9+
free or open-source license, but where it is not possible to determine that specific license.

src/licensedcode/data/licenses/generic-cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ short_name: Generic CLA
44
name: Prior Generic Contributor License Agreement
55
category: Unstated License
66
owner: Unspecified
7-
notes: this is a generic license for CLAs.
87
spdx_license_key: LicenseRef-scancode-generic-cla
8+
notes: this is a generic license for CLAs.

src/licensedcode/data/licenses/generic-exception.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ short_name: Generic Exception Notice
33
name: Generic Exception Notice
44
category: Unstated License
55
owner: Unspecified
6-
notes: this is a generic license exception notice. Actual terms are most commonly related to
7-
rare, one-off extra permission to the A/L/GPL licenses
86
is_exception: yes
97
is_generic: yes
108
spdx_license_key: LicenseRef-scancode-generic-exception
9+
notes: This is a generic license exception notice where the exception text has not been named
10+
and published publicly. Actual terms are most commonly related to rare, one-off
11+
extra permission to the A/L/GPL licenses.

src/licensedcode/data/licenses/generic-export-compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ short_name: Generic Export Compliance Notice
33
name: Generic Export Compliance Notice
44
category: Unstated License
55
owner: Unspecified
6-
notes: this is a generic export compliance notice. Actual terms are most commonly related to
7-
cryptography
86
is_generic: yes
97
spdx_license_key: LicenseRef-scancode-generic-export-compliance
8+
notes: This is a generic export compliance notice where the text has not been named and
9+
published publicly. Actual terms are most commonly related to cryptography.

src/licensedcode/data/licenses/generic-tos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ short_name: Generic ToS
33
name: Generic Terms of Service
44
category: Unstated License
55
owner: Unspecified
6-
notes: this is a generic license for Terms of Service such as aprivary terms and and other ToS-like
7-
agreement found in software but that are not directly licenses.
86
is_generic: yes
97
spdx_license_key: LicenseRef-scancode-generic-tos
8+
notes: This is a generic license for Terms of Service such as privacy terms and and other
9+
ToS-like agreements found in software that are not directly licenses.

src/licensedcode/data/licenses/generic-trademark.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ short_name: Generic Trademark Notice
33
name: Generic Trademark and Name Protection Notice
44
category: Unstated License
55
owner: Unspecified
6-
notes: this is a generic export Trademark and name realted notice. Actual terms are most commonly
7-
related to name use restrictions and no endorsement. This should be used only for rare one-off
8-
notices.
96
is_generic: yes
107
spdx_license_key: LicenseRef-scancode-generic-trademark
118
other_spdx_license_keys:
129
- LicenseRef-scancode-trademark-notice
13-
10+
notes: This is a generic Trademark and name realted notice. Actual terms are most commonly
11+
related to name use restrictions and no endorsement. This should be used only for rare one-off
12+
notices.

src/licensedcode/data/licenses/unknown-license-reference.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ name: Unknown License file reference
44
category: Unstated License
55
owner: Unspecified
66
is_unknown: yes
7-
notes: This is reference to a license file with no clear license. this was known before as "see-license"
8-
and "license-file-reference"
97
spdx_license_key: LicenseRef-scancode-unknown-license-reference
8+
notes: This applies to the case of a file with no clear license, which may be referenced
9+
via URL or text such as "See license in..." or "This file is licensed under...",
10+
but where the reference cannot be resolved to a specific named, public license.

src/licensedcode/data/licenses/unknown-spdx.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ category: Unstated License
55
owner: Unspecified
66
is_unknown: yes
77
spdx_license_key: LicenseRef-scancode-unknown-spdx
8-
notes: This is something that clearly ressembles a license in an SPDX license
9-
expression but is not conclusively an SPDX license ID.
8+
notes: This applies to an invalid reference to an SPDX license identifier.

src/licensedcode/data/licenses/unknown.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ category: Unstated License
55
owner: Unspecified
66
is_unknown: yes
77
spdx_license_key: LicenseRef-scancode-unknown
8-
notes: This is something that clearly ressembles a license but is not conclusive.
8+
notes: This applies to the case where there is text referring to a license, but it is not
9+
possible to determine exactly which license.

0 commit comments

Comments
 (0)