Merge branch 'gh-pages' into patch-1

_includes/sidebar.html

@@ -11,12 +11,12 @@
   </div>
 
   <div class="how-to-apply">
-    <h3>How to apply this license</h3>
+    <h3 id="how-to-apply">How to apply this license</h3>
     <p>
       {{ page.how | markdownify | remove: '<p>' | remove: '</p>' }}
     </p>
     <div class="note">
-    <h4>Optional steps</h4>
+    <h4 id="optional-steps">Optional steps</h4>
     {% if page.note %}
     <p>
       {{ page.note | markdownify | remove: '<p>' | remove: '</p>' }}
@@ -24,9 +24,9 @@
     {% endif %}
     {% assign xgpl = false %}
     {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %}
-    <p>Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="https://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
+    <p id="package-metadata">Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="https://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
     {% if page.spdx-id contains 'GPL-2' %}
-    <p>If you would like your project to adopt the GPL-3.0's cure provision, add the <a href="https://github.com/gplcc/gplcc/blob/master/Project/COMMITMENT">text</a> of the <a href="https://gplcc.github.io/gplcc/">GPL Cooperation Commitment</a> to a file named <code>COMMITMENT</code> in the same directory as your {{ page.spdx-id }} license file.</p>
+    <p id="gplcc">If you would like your project to adopt the GPL-3.0's cure provision, add the <a href="https://github.com/gplcc/gplcc/blob/master/Project/COMMITMENT">text</a> of the <a href="https://gplcc.github.io/gplcc/">GPL Cooperation Commitment</a> to a file named <code>COMMITMENT</code> in the same directory as your {{ page.spdx-id }} license file.</p>
     {% endif %}
     </div>
   </div>

_licenses/afl-3.0.txt

@@ -26,7 +26,7 @@ limitations:
 
 ---
 
-Academic Free License (“AFL”) v. 3.0
+Academic Free License ("AFL") v. 3.0
 
 This Academic Free License (the "License") applies to any original work of
 authorship (the "Original Work") whose owner (the "Licensor") has placed the
@@ -48,9 +48,11 @@ the following:
 
      c) to distribute or communicate copies of the Original Work and
      Derivative Works to the public, under any license of your choice that
-     does not contradict the terms and conditions, including Licensor’s
+     does not contradict the terms and conditions, including Licensor's
      reserved rights and remedies, in this Academic Free License;
+
      d) to perform the Original Work publicly; and
+
      e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
@@ -74,7 +76,7 @@ of any contributors to the Original Work, nor any of their trademarks or
 service marks, may be used to endorse or promote products derived from this
 Original Work without express prior permission of the Licensor. Except as
 expressly stated herein, nothing in this License grants any license to
-Licensor’s trademarks, copyrights, patents, trade secrets or any other
+Licensor's trademarks, copyrights, patents, trade secrets or any other
 intellectual property. No patent license is granted to make, use, sell, offer
 for sale, have made, or import embodiments of any patent claims other than the
 licensed claims defined in Section 2. No license is granted to the trademarks
@@ -132,7 +134,7 @@ the activities listed in Section 1, including your right to create Derivative
 Works based upon the Original Work, and doing so without honoring these terms
 and conditions is prohibited by copyright law and international treaty.
 Nothing in this License is intended to affect copyright exceptions and
-limitations (including “fair use” or “fair dealing”). This License shall
+limitations (including "fair use" or "fair dealing"). This License shall
 terminate immediately and You may no longer exercise any of the rights granted
 to You by this License upon your failure to honor the conditions in Section
 1(c).
@@ -156,7 +158,7 @@ subject to the requirements and penalties of copyright or patent law in the
 appropriate jurisdiction. This section shall survive the termination of this
 License.
 
-12) Attorneys’ Fees. In any action to enforce the terms of this License or
+12) Attorneys' Fees. In any action to enforce the terms of this License or
 seeking damages relating thereto, the prevailing party shall be entitled to
 recover its costs and expenses, including, without limitation, reasonable
 attorneys' fees and costs incurred in connection with such action, including

_licenses/osl-3.0.txt

@@ -34,7 +34,7 @@ limitations:
 
 ---
 
-Open Software License ("OSL") v 3.0
+Open Software License ("OSL") v. 3.0
 
 This Open Software License (the "License") applies to any original work of
 authorship (the "Original Work") whose owner (the "Licensor") has placed the

_licenses/upl-1.0.txt

@@ -9,9 +9,9 @@ how: Insert the license or a link to it along with a copyright notice into your
 note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/.
 
 using:
-  - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE.txt
-  - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE
   - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes/blob/master/LICENSE
+  - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE
+  - Skater: https://github.com/oracle/Skater/blob/master/LICENSE
 
 permissions:
   - commercial-use

about.md

@@ -20,6 +20,7 @@ See our [appendix](/appendix/) for a table of all of the licenses cataloged in t
 
 * Open Source Initiative's FAQ on [Which Open Source license should I choose to release my software under?](https://opensource.org/faq#which-license)
 * Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.html)
+* [Joinup Licensing Assistant](https://joinup.ec.europa.eu/collection/eupl/joinup-licensing-assistant-jla), an interactive license chooser from the European Commission
 * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues
 
 ## Help us improve it