From 424d015911beb81bb221870bf9543ee8dfe19785 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 18 Jun 2019 17:07:52 -0700 Subject: [PATCH 1/4] Add Joinup Licensing Assistant to About: additional resources Additional background on the project at https://lists.spdx.org/g/Spdx-legal/topic/32099229#2628 --- about.md | 1 + 1 file changed, 1 insertion(+) diff --git a/about.md b/about.md index 779115e..deea9d3 100644 --- a/about.md +++ b/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 From 00f09537eabf6b5ed61335e7de9f6bad437e6e77 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 20 Jun 2019 12:48:21 -0700 Subject: [PATCH 2/4] Consistent formatting of AFL-3.0 and OSL-3.0 --- _licenses/afl-3.0.txt | 12 +++++++----- _licenses/osl-3.0.txt | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 07ec7a1..7c19318 100644 --- a/_licenses/afl-3.0.txt +++ b/_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 diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 4533ce3..6457b2d 100644 --- a/_licenses/osl-3.0.txt +++ b/_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 From a03c1068c8b4ea6558b6374f618ca64c26bda20b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 27 Jun 2019 20:36:45 -0700 Subject: [PATCH 3/4] Swap out no longer detectable UPL-1.0 example --- _licenses/upl-1.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index a722b4f..eb7f4f7 100644 --- a/_licenses/upl-1.0.txt +++ b/_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 From 18ec54b71ee685a8c7b8b480faf8773ae1b7df15 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 9 Jul 2019 10:15:56 -0500 Subject: [PATCH 4/4] add ids to sidebar for better linking --- _includes/sidebar.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 9e72e6e..9287f64 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -11,12 +11,12 @@
-

How to apply this license

+

How to apply this license

{{ page.how | markdownify | remove: '

' | remove: '

' }}

-

Optional steps

+

Optional steps

{% if page.note %}

{{ page.note | markdownify | remove: '

' | remove: '

' }} @@ -24,9 +24,9 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

+

Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

{% if page.spdx-id contains 'GPL-2' %} -

If you would like your project to adopt the GPL-3.0's cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

+

If you would like your project to adopt the GPL-3.0's cure provision, add the text of the GPL Cooperation Commitment to a file named COMMITMENT in the same directory as your {{ page.spdx-id }} license file.

{% endif %}