From 3b91b5e3cb6c0f0b3607c70839beca31cce820e5 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Tue, 24 Nov 2020 18:27:40 -0700 Subject: [PATCH 1/5] update description and links update description and links to be current --- resources/htmlTemplate/TocHTMLTemplate.html | 24 ++++++++++----------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/resources/htmlTemplate/TocHTMLTemplate.html b/resources/htmlTemplate/TocHTMLTemplate.html index 5ea92c4..279836f 100644 --- a/resources/htmlTemplate/TocHTMLTemplate.html +++ b/resources/htmlTemplate/TocHTMLTemplate.html @@ -136,21 +136,19 @@

Software Package Data Exchange (SPDX)SPDX License List

-

The SPDX License List is a list of commonly found licenses and exceptions used in free and open source and other collaborative software or documentation. The purpose of the SPDX License List is to enable - easy and efficient identification of such licenses and exceptions in an SPDX document, in source files - or elsewhere. The SPDX License List includes a standardized short identifier, full name, vetted license - text including matching guidelines markup as appropriate, and a canonical permanent - URL for each license and exception. +

The SPDX License List is an integral part of the SPDX Specification. The SPDX License List itself is a list of commonly found licenses and exceptions used in free and open or collaborative software, data, hardware, or documentation. The SPDX License List includes a standardized short identifier, the full name, the license text, and a canonical permanent URL for each license and exception.

- +

The purpose of the SPDX License List is to enable efficient and reliable identification of such licenses and exceptions in an SPDX document, in source files or elsewhere.

+ From cc425b6c30c8c033973e2b0239070275ec8b5459 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Tue, 24 Nov 2020 18:30:45 -0700 Subject: [PATCH 2/5] update links to be current --- .../htmlTemplate/ExceptionsTocHTMLTemplate.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html index 64bc381..f59247c 100644 --- a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html +++ b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html @@ -135,14 +135,17 @@

License Exceptions

The SPDX License List includes a list of exceptions. These exceptions grant an exception to a license condition or additional permissions beyond those granted in a license; they are not stand-alone licenses. Exceptions are added to a license using the License Expression operator, "WITH".

+

Version: {{version}}

From fb162648c81107c52358912159cd98e548d6865e Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 18 Feb 2021 11:33:16 -0500 Subject: [PATCH 3/5] Update ExceptionsTocHTMLTemplate.html Signed-off-by: Steve Winslow --- resources/htmlTemplate/ExceptionsTocHTMLTemplate.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html index f59247c..d53bb43 100644 --- a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html +++ b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html @@ -136,16 +136,15 @@

License Exceptions

-

Version: {{version}}

From 1a2b44cc0273bfe42a162d27df60ccfdd8219da2 Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 18 Feb 2021 11:36:32 -0500 Subject: [PATCH 4/5] Update ExceptionsTocHTMLTemplate.html Signed-off-by: Steve Winslow --- resources/htmlTemplate/ExceptionsTocHTMLTemplate.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html index d53bb43..34e327a 100644 --- a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html +++ b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html @@ -137,9 +137,9 @@

License Exceptions