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

Make License Expression links more direct #157

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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 resources/htmlTemplate/ExceptionsTocHTMLTemplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h1><a href="/" title="Home" rel="home">Software Package Data Exchange (SPDX)</a
<div id="page" class="page">

<h1>License Exceptions</h1>
<p>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 <a href="https://spdx.org/specifications"><strong>License Expression</strong></a> operator, "WITH".</p>
<p>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 <a href="https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/"><strong>License Expression</strong></a> operator, "WITH".</p>

<ul style="list-style-type: square; padding: 5px;">
<li style="margin:5px 0 5px 10px;"><a href="index.html"><strong>SPDX License List</strong></a></li>
Expand Down
4 changes: 2 additions & 2 deletions resources/htmlTemplate/TocHTMLTemplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h1 id="preamble">SPDX License List</h1>
<p>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. </p>

<ul style="list-style-type: square; padding: 5px;">
<li style="margin:5px 0 5px 10px;"><a href="./exceptions-index.html"><strong>License Exceptions</strong></a> are commonly found exceptions to free and open source licenses, used with the <strong><a href="https://spdx.dev/specifications/">License Expression</a></strong> operator, "WITH" to create a license with an exception. </li>
<li style="margin:5px 0 5px 10px;"><a href="./exceptions-index.html"><strong>License Exceptions</strong></a> are commonly found exceptions to free and open source licenses, used with the <strong><a href="https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/">License Expression</a></strong> operator, "WITH" to create a license with an exception. </li>
<li style="margin:5px 0 5px 10px;">The <a href="https://spdx.github.io/spdx-spec/v2.3/license-matching-guidelines-and-templates/"><strong>matching guidelines</strong></a> define what constitutes a license or exception match. The license text on the HTML pages here will display omitable text in blue and replaceable text in red (see Guideline #2 for more information).</li>
<li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML/blob/master/DOCS/license-fields.md"><strong>Explanation of fields</strong></a> used on the SPDX License List</li>
<li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML/blob/master/DOCS/license-inclusion-principles.md"><strong>License inclusion principles</strong></a> for adding new licenses or exceptions to the SPDX License List</li>
Expand Down Expand Up @@ -178,7 +178,7 @@ <h1 id="preamble">SPDX License List</h1>
<h2 id="deprecated">Deprecated License Identifiers</h2>
<p>SPDX endeavors to never change the SPDX license identifiers. However, sometimes there has been a compelling reason to deprecate a license identifier, such as to accommodate improved SPDX license expressions or when we have found a duplicate license. When a license identifier is "deprecated" on the SPDX License List, it effectively means that there is an updated license identifier and the deprecated license identifier, while remaining valid, should no longer be used. The URL to each deprecated license is retained and those license pages are updated to note the deprecation. Some reasons for deprecation are as follows:
<ul style="list-style-type: square; padding: 5px;">
<li style="margin:5px 0 5px 10px;">Release 2.0 of the SPDX Specification introduced <strong><a href="https://spdx.org/specifications">License Expressions</a></strong> that supports the ability to identify common variations of SPDX-identified licenses without the need to define each potential variation as a distinct license on the SPDX License List. This new syntax supports the ability to declare an SPDX-identified <a href="./exceptions-index.html"><strong>license exception</strong></a> using the "WITH" operator (e.g. GPL-2.0-or-later WITH Autoconf-exception-2.0), as well as the ability to use a simple "+" operator after a license short identifier to indicate "or later version". SPDX has defined a list of license exceptions to use after the "WITH" operator. As a result, a number of licenses formerly included on the SPDX License List have been deprecated, and correct usage employs the License Expression syntax as of v2.0. </li>
<li style="margin:5px 0 5px 10px;">Release 2.0 of the SPDX Specification introduced <strong><a href="https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/">License Expressions</a></strong> that supports the ability to identify common variations of SPDX-identified licenses without the need to define each potential variation as a distinct license on the SPDX License List. This new syntax supports the ability to declare an SPDX-identified <a href="./exceptions-index.html"><strong>license exception</strong></a> using the "WITH" operator (e.g. GPL-2.0-or-later WITH Autoconf-exception-2.0), as well as the ability to use a simple "+" operator after a license short identifier to indicate "or later version". SPDX has defined a list of license exceptions to use after the "WITH" operator. As a result, a number of licenses formerly included on the SPDX License List have been deprecated, and correct usage employs the License Expression syntax as of v2.0. </li>
<li style="margin:5px 0 5px 10px;">Release 3.0 replaced previous Identifiers for GNU licenses with more explicit Identifiers to reflect the "this version only" or "any later version" option specific to those licenses. As such, the previously used Identifiers for those licenses are deprecated as of v3.0.</li>
<li style="margin:5px 0 5px 10px;">Other licenses may have been deprecated for the reasons noted.</li>
</ul>
Expand Down