Merge pull request #89 from spdx/jlovejoy-ToC

update description and links
spdx · Feb 18, 2021 · f733296 · f733296
2 parents d759b8d + e512904
commit f733296
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html b/resources/htmlTemplate/ExceptionsTocHTMLTemplate.html
@@ -135,12 +135,14 @@ <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>
 
       <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>: The list of commonly found free and open source licenses for the purposes of being able to easily and efficiently identify such licenses.</li>
-			<li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML"><strong>Master Files</strong></a>:  The HTML pages you see here are generated from the master files for the SPDX License List.  </li>
-            <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-data"><strong>Data Files</strong></a>:  Machine readable files describing all of the licenses and license exceptions.</li>
-            <li style="margin:0px 0 5px 10px;"><a href="http://spdx.org/spdx-license-list/license-list-overview"><strong>Overview</strong></a>: General information about the SPDX License List, including principles for inclusion of a license and an explanation of the fields contained on the list.</li>
-            <li style="margin:5px 0 5px 10px;"><a href="http://spdx.org/spdx-license-list/matching-guidelines"><strong>Matching Guidelines</strong></a>:  Guidelines for what constitutes a license match to the SPDX License List. For licenses that include markup, 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/CONTRIBUTING.md"><strong>Request New License</strong></a>: Instructions for proposing a license or exception be added to the SPDX License List.</li>
+            <li style="margin:5px 0 5px 10px;"><a href="index.html"><strong>SPDX License List</strong></a></li>
+            <li style="margin:5px 0 5px 10px;">The <a href="https://spdx.dev/license-list/matching-guidelines/"><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>
+	      <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML/blob/master/CONTRIBUTING.md"><strong>Contribute</strong></a> to the project or request a new license</li>
+	      <li style="margin:0px 0 5px 10px;">Use <a href="http://spdx.dev/ids"><strong>short identifiers in your source code</strong></a></li>
+	      <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML"><strong>Github repo</strong></a></li>
+            <li style="margin:5px 0 5px 10px;">Machine readable <a href="https://github.com/spdx/license-list-data"><strong>data files</strong></a> for the SPDX License List</li>
 
       </ul>
 

diff --git a/resources/htmlTemplate/TocHTMLTemplate.html b/resources/htmlTemplate/TocHTMLTemplate.html
@@ -136,21 +136,19 @@ <h1><a href="/" title="Home" rel="home">Software Package Data Exchange (SPDX)</a
 
       <h1>SPDX License List</h1>
 
-      <p>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.   
+      <p>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.    
       </p>
-
+	<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>: The list of commonly found exceptions to free and open source licenses, which can be used with the <strong><a href="https://spdx.org/specifications">License Expression</a></strong> operator, "WITH" to create a license with an exception. </li>
-            <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML"><strong>Master Files</strong></a>:  The HTML pages you see here are generated from the master files for the SPDX License List. </li>
-            <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-data"><strong>Data Files</strong></a>:  Machine readable files describing all of the licenses and license exceptions.</li>
-            <li style="margin:0px 0 5px 10px;"><a href="http://spdx.org/spdx-license-list/license-list-overview"><strong>Overview</strong></a>: General information about the SPDX License List, including principles for inclusion of a license and an explanation of the fields contained on the list.</li>
-            <li style="margin:0px 0 5px 10px;"><a href="http://spdx.org/ids"><strong>IDs</strong></a>: Learn more about using short-form license identifiers in your source code.</li>
-            <li style="margin:5px 0 5px 10px;"><a href="http://spdx.org/spdx-license-list/matching-guidelines"><strong>Matching Guidelines</strong></a>:  Guidelines for what constitutes a license match to the SPDX License List. 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/CONTRIBUTING.md"><strong>Request New License</strong></a>: Instructions for proposing a license or exception be added to the SPDX License List.</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.dev/specifications/">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.dev/license-list/matching-guidelines/"><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>
+	      <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML/blob/master/CONTRIBUTING.md"><strong>Contribute</strong></a> to the project or request a new license</li>
+	      <li style="margin:0px 0 5px 10px;">Use <a href="https://spdx.dev/ids"><strong>short identifiers in your source code</strong></a></li>
+	      <li style="margin:5px 0 5px 10px;"><a href="https://github.com/spdx/license-list-XML"><strong>Github repo</strong></a></li>
+            <li style="margin:5px 0 5px 10px;">Machine readable <a href="https://github.com/spdx/license-list-data"><strong>data files</strong></a> for the SPDX License List</li>
 
       </ul>