From 57f7891273607feecdeeb968a1adedb38331f8eb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 12 Dec 2016 14:29:25 -0800 Subject: [PATCH 01/68] no-liability -> liability, warranty rename and add tag and associated descriptions fixes #412 --- README.md | 3 +- _data/rules.yml | 9 +++-- _licenses/afl-3.0.txt | 3 +- _licenses/agpl-3.0.txt | 3 +- _licenses/apache-2.0.txt | 3 +- _licenses/artistic-2.0.txt | 5 +-- _licenses/bsd-2-clause.txt | 3 +- _licenses/bsd-3-clause-clear.txt | 3 +- _licenses/bsd-3-clause.txt | 3 +- _licenses/bsl-1.0.txt | 3 +- _licenses/cc-by-4.0.txt | 5 +-- _licenses/cc-by-sa-4.0.txt | 5 +-- _licenses/cc0-1.0.txt | 3 +- _licenses/epl-1.0.txt | 3 +- _licenses/eupl-1.1.txt | 3 +- _licenses/gpl-2.0.txt | 3 +- _licenses/gpl-3.0.txt | 3 +- _licenses/isc.txt | 3 +- _licenses/lgpl-2.1.txt | 3 +- _licenses/lgpl-3.0.txt | 3 +- _licenses/lppl-1.3c.txt | 58 ++++++++++++++++---------------- _licenses/mit.txt | 3 +- _licenses/mpl-2.0.txt | 3 +- _licenses/ms-pl.txt | 2 +- _licenses/ms-rl.txt | 2 +- _licenses/ofl-1.1.txt | 3 +- _licenses/osl-3.0.txt | 3 +- _licenses/unlicense.txt | 3 +- _licenses/zlib.txt | 3 +- 29 files changed, 90 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index a957412..d7cb337 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,9 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Limitations * `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. -* `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages. +* `liability` - This license includes a limitation of liability. * `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. +* `warranty` - The license explicitly states that it does NOT provide any warranty. ## License diff --git a/_data/rules.yml b/_data/rules.yml index 738fd5f..8d1807f 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -36,9 +36,12 @@ limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. label: Trademark Use tag: trademark-use -- description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. - label: Hold Liable - tag: no-liability +- description: This license includes a limitation of liability. + label: Liability + tag: liability - description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. label: Patent Use tag: patent-use +- description: The license explicitly states that it does NOT provide any warranty. + label: Warranty + tag: warranty diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index e1bf41c..07754dd 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -20,7 +20,8 @@ conditions: limitations: - trademark-use - - no-liability + - liability + - warranty --- diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 0fe30ed..fe61572 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -27,7 +27,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 19aa398..2180c26 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -30,7 +30,8 @@ conditions: limitations: - trademark-use - - no-liability + - liability + - warranty --- diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 6bfd6ea..755a4af 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -20,8 +20,9 @@ conditions: - document-changes limitations: - - no-liability + - liability - trademark-use + - warranty --- @@ -135,7 +136,7 @@ you do at least ONE of the following: (c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under - + (i) the Original License or (ii) a license that permits the licensee to freely copy, diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 5add7a3..73de9c3 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -19,7 +19,8 @@ conditions: - include-copyright limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index b175955..52152d6 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -17,8 +17,9 @@ conditions: - include-copyright limitations: - - no-liability + - liability - patent-use + - warranty --- diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index ecc98ac..f74002d 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -18,7 +18,8 @@ conditions: - include-copyright limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index 04adcb0..25c2f65 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -19,7 +19,8 @@ conditions: - include-copyright limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index f0d179c..1d4c773 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -18,9 +18,10 @@ conditions: - document-changes limitations: - - no-liability + - liability - trademark-use - patent-use + - warranty --- @@ -75,7 +76,7 @@ exhaustive, and do not form part of our licenses. such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More_considerations - for the public: + for the public: wiki.creativecommons.org/Considerations_for_licensees ======================================================================= diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index c7d9239..96f3c43 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -19,9 +19,10 @@ conditions: - same-license limitations: - - no-liability + - liability - trademark-use - patent-use + - warranty --- @@ -76,7 +77,7 @@ exhaustive, and do not form part of our licenses. such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More_considerations - for the public: + for the public: wiki.creativecommons.org/Considerations_for_licensees ======================================================================= diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index defd17d..886aaaf 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -19,9 +19,10 @@ permissions: conditions: [] limitations: - - no-liability + - liability - trademark-use - patent-use + - warranty --- diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 91307a8..80712e9 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -27,7 +27,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 49076d2..5d5d30b 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -25,8 +25,9 @@ conditions: - same-license limitations: - - no-liability + - liability - trademark-use + - warranty --- diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 4d1bedb..06a90fe 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -29,7 +29,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 01358f8..010070c 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -32,7 +32,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/isc.txt b/_licenses/isc.txt index cae0ef1..867a66a 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -22,7 +22,8 @@ conditions: - include-copyright limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 9b353e8..7dbfc2a 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -25,7 +25,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 6c68924..b7fd1dd 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -26,7 +26,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 7d2ee84..42d45c4 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -3,7 +3,7 @@ title: LaTeX Project Public License v1.3c spdx-id: LPPL-1.3c source: https://latex-project.org/lppl/lppl-1-3c.html -description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed. +description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed. how: To use this license, place in each of the components of your work both an explicit copyright notice including your name and the year the work was authored and/or last substantially modified. Include also a statement that the distribution and/or modification of that component is constrained by the conditions in this license. @@ -17,11 +17,12 @@ permissions: conditions: - include-copyright - - document-changes + - document-changes - disclose-source - + limitations: - - no-liability + - liability + - warranty --- @@ -43,8 +44,8 @@ which the LaTeX kernel and the base LaTeX packages are distributed. You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -it is written in such a way that you can use it even if your work is +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is unrelated to TeX. The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', @@ -71,11 +72,11 @@ In this license document the following terms are used: `Work' Any work being distributed under this License. - + `Derived Work' Any work that under any applicable law is derived from the Work. - `Modification' + `Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of @@ -85,7 +86,7 @@ In this license document the following terms are used: `Modify' To apply any procedure that produces a Derived Work under any applicable law. - + `Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) @@ -106,16 +107,16 @@ In this license document the following terms are used: no such explicit nomination then it is the `Copyright Holder' under any applicable law. - `Base Interpreter' + `Base Interpreter' A program or process that is normally needed for running or - interpreting a part or the whole of the Work. + interpreting a part or the whole of the Work. A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the + `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. @@ -156,8 +157,8 @@ the Derived Work. distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the @@ -167,13 +168,13 @@ to a component of the Work. clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. - + b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. - + c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) @@ -183,7 +184,7 @@ to a component of the Work. d. You distribute at least one of the following with the Derived Work: - 1. A complete, unmodified copy of the Work; + 1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy @@ -210,15 +211,15 @@ format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. - + 10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. - + b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the + itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. 11. This license places no restrictions on works that are unrelated to @@ -287,7 +288,7 @@ the Work through the following steps: a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. - + b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over @@ -297,17 +298,17 @@ the Work through the following steps: 3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. - + b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. - + then this takes effect immediately upon announcement. + 4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. - + 5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must @@ -390,7 +391,7 @@ Here is an example of such a notice and statement: % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. - % + % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins @@ -404,7 +405,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. +Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it @@ -434,10 +435,9 @@ Important Recommendations using a line such as: % This work consists of all files listed in manifest.txt. - + in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. - diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 7fefea5..ad07380 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -24,7 +24,8 @@ conditions: - include-copyright limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 22d075b..ec461ce 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -29,8 +29,9 @@ conditions: - same-license limitations: - - no-liability + - liability - trademark-use + - warranty --- diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 8505a1b..dc1485a 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -18,7 +18,7 @@ conditions: - include-copyright limitations: - - no-liability + - warranty - trademark-use --- diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 8619ffc..db4fb67 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -20,7 +20,7 @@ conditions: - same-license limitations: - - no-liability + - warranty - trademark-use --- diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 9b22a4a..0190094 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -21,7 +21,8 @@ conditions: - same-license limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index a47570b..cd28ec3 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -30,7 +30,8 @@ conditions: limitations: - trademark-use - - no-liability + - liability + - warranty --- diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 20bae3e..a5c8e26 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -22,7 +22,8 @@ permissions: conditions: [] limitations: - - no-liability + - liability + - warranty --- diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 01ba76e..e287ef6 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -18,7 +18,8 @@ conditions: - document-changes limitations: - - no-liability + - liability + - warranty --- From ff7cfdc44ca2f3f60eb9217d964e35f3d1a78c31 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 12 Dec 2016 14:34:21 -0800 Subject: [PATCH 02/68] order gems so rubocop doesn't complain --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 66b1bc6..44de39e 100644 --- a/Gemfile +++ b/Gemfile @@ -8,14 +8,14 @@ gem 'github-pages', versions['github-pages'] group :development do gem 'colored' - gem 'terminal-table' gem 'fuzzy_match' + gem 'terminal-table' end group :test do gem 'html-proofer', '~> 3.0' + gem 'nokogiri' gem 'rake' gem 'rspec' - gem 'nokogiri' gem 'rubocop' end From 234d416f73aeeb5eaefc7e1a5649595e56d9604a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 19 Dec 2016 10:48:25 -0800 Subject: [PATCH 03/68] notices with code->software notice condition of open source licenses usually for any distribution, not only source code form fixes #272 --- README.md | 2 +- _data/rules.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a957412..25d5872 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Conditions -* `include-copyright` - Include a copy of the license and copyright notice with the code. +* `include-copyright` - Include a copy of the license and copyright notice with the software. * `document-changes` - Indicate changes made to the code. * `disclose-source` - Source code must be made available when distributing the software. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. diff --git a/_data/rules.yml b/_data/rules.yml index 738fd5f..73cf459 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -16,7 +16,7 @@ permissions: tag: patent-use conditions: -- description: Include a copy of the license and copyright notice with the code. +- description: Include a copy of the license and copyright notice with the software. label: License and Copyright Notice tag: include-copyright - description: Indicate changes made to the code. From 8bb03bb4e35f84676a37316b022d937bf352fe5f Mon Sep 17 00:00:00 2001 From: Guilherme Scaranse Date: Mon, 2 Jan 2017 22:28:14 -0200 Subject: [PATCH 04/68] Update ruby version in travis.yml Nokogiri requires ruby >= 2.1.0 to be used, and fails to complete travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d15e661..99727bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.0.0 + - 2.1.0 branches: only: From fd6fb2846aaba106c74bd5f61300900ab73c65aa Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 2 Jan 2017 19:51:46 -0800 Subject: [PATCH 05/68] bump to 2.3.3 to match pages version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99727bf..edbe773 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.1.0 + - 2.3.3 branches: only: From 7b4890ddf6c3faa23f7964cda38b289a40b31fb5 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 2 Jan 2017 21:28:12 -0800 Subject: [PATCH 06/68] check .travis.yml ruby verison matches pages https://github.com/github/choosealicense.com/pull/472#issuecomment-270048688 very rough, naive, probably bad implementation --- spec/ci_ruby_version_spec.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 spec/ci_ruby_version_spec.rb diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb new file mode 100644 index 0000000..e787015 --- /dev/null +++ b/spec/ci_ruby_version_spec.rb @@ -0,0 +1,21 @@ +require 'json' +require 'open-uri' +require 'spec_helper' +require 'yaml' + +describe 'ci ruby version' do + pages_versions = JSON.parse(open('https://pages.github.com/versions.json').read) + pages_ruby_version = pages_versions['ruby'] + + ci_config_file = '.travis.yml' + + ci_config = YAML.load_file(ci_config_file) + ci_ruby_version = ci_config['rvm'][0] + + context "#{ci_config_file} and pages ruby versions" do + it 'do not match' do + msg = "(#{ci_ruby_version}) != (#{pages_ruby_version})" + expect(ci_ruby_version).to eql(pages_ruby_version), msg + end + end +end From 7de7b2c8ef45fa3ca38d0a24318e1ac9f7d53cc9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 3 Jan 2017 10:18:27 -0800 Subject: [PATCH 07/68] affirmative wording https://github.com/github/choosealicense.com/pull/473#discussion_r94403400 --- spec/ci_ruby_version_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index e787015..3b47ec5 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -12,8 +12,8 @@ describe 'ci ruby version' do ci_config = YAML.load_file(ci_config_file) ci_ruby_version = ci_config['rvm'][0] - context "#{ci_config_file} and pages ruby versions" do - it 'do not match' do + context "in #{ci_config_file} and pages ruby version" do + it 'match' do msg = "(#{ci_ruby_version}) != (#{pages_ruby_version})" expect(ci_ruby_version).to eql(pages_ruby_version), msg end From fad13d2de4bdd91c1dda5d236a4460018f9a6124 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 4 Jan 2017 08:53:18 -0800 Subject: [PATCH 08/68] document fixing error in test output https://github.com/github/choosealicense.com/pull/473#issuecomment-270185138 --- spec/ci_ruby_version_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index 3b47ec5..7a39ad5 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -14,7 +14,7 @@ describe 'ci ruby version' do context "in #{ci_config_file} and pages ruby version" do it 'match' do - msg = "(#{ci_ruby_version}) != (#{pages_ruby_version})" + msg = "#{ci_ruby_version} != #{pages_ruby_version}; please add a commit bumping in #{ci_config_file}" expect(ci_ruby_version).to eql(pages_ruby_version), msg end end From dcea53171e527f1b9d96bc5465a4d4a3575db68a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Jan 2017 17:23:54 -0800 Subject: [PATCH 09/68] Putdown one-use downcase script Seems to be one-time use https://github.com/github/choosealicense.com/pull/221 and doesn't need to stick around. Side note: I wondered what was going on with the double rename. I guess to make work with case insensitive file systems, which I had forgotten about. --- script/downcase | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 script/downcase diff --git a/script/downcase b/script/downcase deleted file mode 100755 index 2fb3147..0000000 --- a/script/downcase +++ /dev/null @@ -1,7 +0,0 @@ -#! /usr/bin/env ruby -# downcases all licenses in a git-friendly way - -Dir['_licenses/*'].each do |file| - system "git mv #{file} #{file.downcase}2" - system "git mv #{file.downcase}2 #{file.downcase}" -end From db878ed8f9120c56189265d480a37e1b3d9bc7ee Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Tue, 17 Jan 2017 11:59:22 -0800 Subject: [PATCH 10/68] Check images for consistent use of http/https --- Rakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 9cf7614..412dcbb 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,8 @@ task :test do HTMLProofer.check_directory('./_site', check_html: true, validation: { ignore_script_embeds: true }, - url_swap: { %r{http://choosealicense.com} => '' }).run + url_swap: { %r{http://choosealicense.com} => '' }, + check_img_http: true).run end task :approved_licenses do From 1a728bdd264f672e0ceda8ae8d735e13d32b7192 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 17 Jan 2017 13:37:52 -0800 Subject: [PATCH 11/68] disable rubocop check new in 0.47 Avoid: ``` spec/license_spec.rb:3:1: C: Metrics/BlockLength: Block has too many lines. [40/25] describe 'licenses' do ... ^^^^^^^^^^^^^^^^^^^^^^ spec/license_spec.rb:8:3: C: Metrics/BlockLength: Block has too many lines. [35/25] licenses.each do |license| ... ^^^^^^^^^^^^^^^^^^^^^^^^^^ spec/license_spec.rb:9:5: C: Metrics/BlockLength: Block has too many lines. [33/25] context "The #{license['title']} license" do ... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` Doesn't seem worth refactoring, but happy to be wrong. --- .rubocop.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 07d01c1..6c5cba1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,9 +1,12 @@ AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.3 Exclude: - _site/**/* - vendor/**/* +Metrics/BlockLength: + Enabled: false + Metrics/LineLength: Enabled: false From 472237f8723f2b839b1a580127856a0d52edd843 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 17 Jan 2017 14:10:51 -0800 Subject: [PATCH 12/68] don't bump rubocop to 2.3 yet --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 6c5cba1..02d49ba 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.1 Exclude: - _site/**/* - vendor/**/* From 8360759d874d46283115eda499e6db40bcce8787 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Jan 2017 11:58:54 -0800 Subject: [PATCH 13/68] https in config/test strip, maybe no functional difference --- Rakefile | 2 +- _config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 412dcbb..7e2647e 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ task :test do HTMLProofer.check_directory('./_site', check_html: true, validation: { ignore_script_embeds: true }, - url_swap: { %r{http://choosealicense.com} => '' }, + url_swap: { %r{https://choosealicense.com} => '' }, check_img_http: true).run end diff --git a/_config.yml b/_config.yml index 74e1fce..e5d4e8d 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ title: Choose a License description: Non-judgmental guidance on choosing a license for your open source project relative_permalinks: false markdown: kramdown -url: "http://choosealicense.com" +url: "https://choosealicense.com" collections: licenses: From f08ace3feb061c26145cfe2c34fb44dcbc769947 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Jan 2017 13:31:19 -0800 Subject: [PATCH 14/68] make rubocop ruby version match pages ruby version --- .rubocop.yml | 2 +- Gemfile | 1 + Rakefile | 1 + script/check-approval | 1 + script/generate-docs | 1 + spec/ci_ruby_version_spec.rb | 16 ++++++++++++++-- spec/license_bom_spec.rb | 1 + spec/license_fields_spec.rb | 1 + spec/license_meta_spec.rb | 1 + spec/license_rules_spec.rb | 1 + spec/license_shown_spec.rb | 1 + spec/license_spec.rb | 1 + spec/spec_helper.rb | 1 + 13 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 02d49ba..6c5cba1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.3 Exclude: - _site/**/* - vendor/**/* diff --git a/Gemfile b/Gemfile index 44de39e..6285dab 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ +# frozen_string_literal: true source 'https://rubygems.org' require 'json' diff --git a/Rakefile b/Rakefile index 7e2647e..01734ae 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'html-proofer' require 'rspec/core/rake_task' diff --git a/script/check-approval b/script/check-approval index 57d2867..2e4c9d2 100755 --- a/script/check-approval +++ b/script/check-approval @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Checks if a given license meets the approval criteria to be added to choosealicense.com # See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license # Usage: script/check-approval [SPDX LICENSE ID] diff --git a/script/generate-docs b/script/generate-docs index e7df50d..b4edae4 100755 --- a/script/generate-docs +++ b/script/generate-docs @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Usage: script/generate-docs # Reads in the fields, meta, and rules YAML files and produces markdown output # suitable for documenting in the project's README diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index 7a39ad5..b61c7c5 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -1,14 +1,14 @@ +# frozen_string_literal: true require 'json' require 'open-uri' require 'spec_helper' require 'yaml' -describe 'ci ruby version' do +describe 'ruby version' do pages_versions = JSON.parse(open('https://pages.github.com/versions.json').read) pages_ruby_version = pages_versions['ruby'] ci_config_file = '.travis.yml' - ci_config = YAML.load_file(ci_config_file) ci_ruby_version = ci_config['rvm'][0] @@ -18,4 +18,16 @@ describe 'ci ruby version' do expect(ci_ruby_version).to eql(pages_ruby_version), msg end end + + rubocop_config_file = '.rubocop.yml' + rubocop_config = YAML.load_file(rubocop_config_file) + rubocop_ruby_version = rubocop_config['AllCops']['TargetRubyVersion'] + pages_ruby_version_minor = pages_ruby_version.match('^(\d+)\.(\d+)')[0] + + context "in #{rubocop_config_file} and pages ruby minor version" do + it 'match' do + msg = "#{rubocop_ruby_version} != #{pages_ruby_version_minor}; please add a commit bumping in #{rubocop_config_file}" + expect(rubocop_ruby_version.to_s).to eql(pages_ruby_version_minor), msg + end + end end diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index 02ec086..a3e2798 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'byte order marks' do diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index 52d04ec..bac33e9 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license fillable fields' do diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 0933085..60ea68b 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license meta' do diff --git a/spec/license_rules_spec.rb b/spec/license_rules_spec.rb index 289d142..83137c2 100644 --- a/spec/license_rules_spec.rb +++ b/spec/license_rules_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'license rules' do diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 7c0ec1d..d2b50e4 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'shown licenses' do diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 2917392..95e6f43 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'spec_helper' describe 'licenses' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f71f332..c99daf6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'jekyll' require 'open-uri' require 'json' From 7eb19e13685890392c4fd719eeb16775deed0360 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 14 Feb 2017 13:22:06 -0800 Subject: [PATCH 15/68] Link to Open Source Guide on The Legal Side of Open Source https://opensource.guide/legal/ one of a set of guides released today https://github.com/blog/2318-announcing-open-source-guides For now just adding as an additional resource, eventually should be worked into home and/or licenses pages. --- about.md | 1 + 1 file changed, 1 insertion(+) diff --git a/about.md b/about.md index 26572d5..cd5914c 100644 --- a/about.md +++ b/about.md @@ -24,6 +24,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) * [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan +* [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues ## Help us improve it From fef584ce1a161f259a9031548cc1398084cfdd36 Mon Sep 17 00:00:00 2001 From: Phineas Date: Wed, 15 Feb 2017 20:29:30 +0000 Subject: [PATCH 16/68] Update LICENSE Copyright Date to 2017 --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 61ed314..a08a18f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2016 GitHub, Inc. and contributors +Copyright (c) 2013-2017 GitHub, Inc. and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6ae1f697d76db394a33fe4cfcddea76c80c7c51a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:37:32 -0800 Subject: [PATCH 17/68] same-license--variations --- _data/rules.yml | 9 +++++++++ _licenses/epl-1.0.txt | 2 +- _licenses/lgpl-2.1.txt | 2 +- _licenses/lgpl-3.0.txt | 2 +- _licenses/mpl-2.0.txt | 2 +- _licenses/ms-rl.txt | 2 +- appendix.md | 22 ++++++++++++---------- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index f1be24a..57400b6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -31,6 +31,15 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same License tag: same-license +- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. + label: Same License (File) + tag: same-license--file +- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. + label: Same License (Library) + tag: same-license--library +- description: Modifications must be released under the same license when distributing the software in source form. + label: Same License (Source) + tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 80712e9..5a5b6c4 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--source limitations: - liability diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 7dbfc2a..d1224d0 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -22,7 +22,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index b7fd1dd..cea10cb 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -23,7 +23,7 @@ conditions: - include-copyright - disclose-source - document-changes - - same-license + - same-license--library limitations: - liability diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index ec461ce..7da98da 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -26,7 +26,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - liability diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index db4fb67..18ab1ca 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -17,7 +17,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license + - same-license--file limitations: - warranty diff --git a/appendix.md b/appendix.md index a28f3be..316c6bd 100644 --- a/appendix.md +++ b/appendix.md @@ -17,7 +17,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% for type in types %} {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} - {% if seen_tags contains rule_obj.tag %} + {% if seen_tags contains rule_obj.tag or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %} @@ -33,20 +33,22 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% assign rules = site.data.rules[type] | sort: "label" %} {% for rule_obj in rules %} {% assign req = rule_obj.tag %} - {% if seen_tags contains req %} + {% if seen_tags contains req or rule_obj.tag contains '--' %} {% continue %} {% endif %} {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %} {% assign seen_req = false %} {% for t in types %} - {% if license[t] contains req %} - - - - - - {% assign seen_req = true %} - {% endif %} + {% for r in license[t] %} + {% if r contains req %} + + + + + + {% assign seen_req = true %} + {% endif %} + {% endfor %} {% endfor %} {% unless seen_req %} From b240450ca97dd807bf88f893e1b32b1ac8c969d7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 14:59:25 -0800 Subject: [PATCH 18/68] add same-license-- variations to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ab072bb..6b7f7e9 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,9 @@ The license properties (rules) are stored as a bulleted list within the licenses * `disclose-source` - Source code must be made available when distributing the software. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. +* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. +* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations From 1ce6e03c5e531cc2d94d0df5c5e097783f9e228d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 19 Feb 2017 17:31:58 -0800 Subject: [PATCH 19/68] simplify --- README.md | 1 - _data/rules.yml | 3 --- _licenses/epl-1.0.txt | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 6b7f7e9..96069a4 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ The license properties (rules) are stored as a bulleted list within the licenses * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. -* `same-license--source` - Modifications must be released under the same license when distributing the software in source form. #### Limitations diff --git a/_data/rules.yml b/_data/rules.yml index 57400b6..ce36cce 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -37,9 +37,6 @@ conditions: - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. label: Same License (Library) tag: same-license--library -- description: Modifications must be released under the same license when distributing the software in source form. - label: Same License (Source) - tag: same-license--source limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 5a5b6c4..80712e9 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -24,7 +24,7 @@ permissions: conditions: - disclose-source - include-copyright - - same-license--source + - same-license limitations: - liability From 092ad597e35d1fba3e062840034e84a469b1fe4d Mon Sep 17 00:00:00 2001 From: Jacob Mischka Date: Thu, 2 Mar 2017 19:18:44 -0600 Subject: [PATCH 20/68] Change copyright date 2004 -> [year] in wtfpl --- _licenses/wtfpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 854bdb6..3ced1d7 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -22,7 +22,7 @@ limitations: [] DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) 2004 [fullname] <[email]> + Copyright (C) [year] [fullname] <[email]> Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long From 556c00626630cf089f5bffc1d51473b11c8d8cb9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 2 Mar 2017 17:37:03 -0800 Subject: [PATCH 21/68] Fix copyright line, which pertains to the license itself See http://www.wtfpl.net/faq/ --- _licenses/wtfpl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 3ced1d7..0c7607f 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -22,7 +22,7 @@ limitations: [] DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) [year] [fullname] <[email]> + Copyright (C) 2004 Sam Hocevar Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long From ada5a49769cae96e8c404cafbe2f13e611df135e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 14 Mar 2017 11:39:34 -0700 Subject: [PATCH 22/68] focus additional resources on choosing an open license, not lists of licenses Fixes #490 which was concerned that the additional resources list did not include all like items, I understand driven by concern that the SPDX license list includes non-open licenses. So does the FSF license list -- worse, it even recommends some. This fix focuses the list on resources about choosing an open license, not resources listing a bunch of licenses. Fortunately both OSI and FSF have pages directly addressing choosing a license. I've removed the SPDX and English Wikipedia lists. --- about.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/about.md b/about.md index cd5914c..a99a430 100644 --- a/about.md +++ b/about.md @@ -18,10 +18,8 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th {: .bullets} -* Open Source Initiative's [list of licenses](https://opensource.org/licenses/) approved as conforming to the [Open Source Definition](https://opensource.org/osd) -* Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) and [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) -* Linux Foundation's [SPDX License List](https://spdx.org/licenses/) -* [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia +* 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.en.html) * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) * [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues From 401fbf5fc0f248126c9fded57265c9d690f249bb Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 14 Mar 2017 19:44:38 -0400 Subject: [PATCH 23/68] convert rule labels to sentance case --- _data/rules.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index ce36cce..4f1c74d 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,6 +1,6 @@ permissions: - description: This software and derivatives may be used for commercial purposes. - label: Commercial Use + label: Commercial use tag: commercial-use - description: This software may be modified. label: Modification @@ -9,44 +9,44 @@ permissions: label: Distribution tag: distribution - description: You may use and modify the software without distributing it. - label: Private Use + label: Private use tag: private-use - description: This license provides an express grant of patent rights from the contributor to the recipient. - label: Patent Use + label: Patent use tag: patent-use conditions: - description: Include a copy of the license and copyright notice with the software. - label: License and Copyright Notice + label: License and copyright notice tag: include-copyright - description: Indicate changes made to the code. - label: State Changes + label: State changes tag: document-changes - description: Source code must be made available when distributing the software. - label: Disclose Source + label: Disclose source tag: disclose-source - description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. - label: Network Use is Distribution + label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same License tag: same-license - description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License (File) + label: Same license (file) tag: same-license--file - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. - label: Same License (Library) + label: Same license (library) tag: same-license--library limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. - label: Trademark Use + label: Trademark use tag: trademark-use - description: This license includes a limitation of liability. label: Liability tag: liability - description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. - label: Patent Use + label: Patent use tag: patent-use - description: The license explicitly states that it does NOT provide any warranty. label: Warranty From 2f005b33f9ed3611d2c066acaf3cfd5f9b3dbd58 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Fri, 17 Mar 2017 11:02:11 +0000 Subject: [PATCH 24/68] Add ECL-2.0 License The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. --- _licenses/ecl-2.0.txt | 240 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 _licenses/ecl-2.0.txt diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt new file mode 100644 index 0000000..ba44158 --- /dev/null +++ b/_licenses/ecl-2.0.txt @@ -0,0 +1,240 @@ +--- +title: Educational Community License v2.0 +spdx-id: ECL-2.0 +source: https://opensource.org/licenses/ECL-2.0 +featured: false +hidden: true + +description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +note: The Apereo Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix. + +using: + - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE + - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE + - Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + - document-changes + +limitations: + - trademark-use + - liability + - warranty + +--- +Educational Community License, Version 2.0 (ECL-2.0) + +Educational Community License + +Version 2.0, April 2007 + +http://opensource.org/licenses/ECL-2.0 + +The Educational Community License version 2.0 ("ECL") consists of the Apache +2.0 license, modified to change the scope of the patent grant in section 3 to +be specific to the needs of the education communities using this license. The +original Apache 2.0 license can be found at: +http://www.apache.org/licenses/LICENSE-2.0 + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership of such +entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, and +configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object +code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that is +included in or attached to the work (an example is provided in the Appendix +below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative +Works shall not include works that remain separable from, or merely link (or +bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the purposes +of this definition, "submitted" means any form of electronic, verbal, or +written communication sent to the Licensor or its representatives, including +but not limited to communication on electronic mailing lists, source code +control systems, and issue tracking systems that are managed by, or on behalf +of, the Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and +such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) alone or +by combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that +the Work or a Contribution incorporated within the Work constitutes direct or +contributory patent infringement, then any patent licenses granted to You +under this License for that Work shall terminate as of the date such +litigation is filed. Any patent license granted hereby with respect to +contributions by an individual employed by an institution or organization is +limited to patent claims where the individual that is the author of the Work +is also the inventor of the patent claims licensed, and where the organization +or institution has the right to grant such license under applicable grant and +research funding agreements. No other express or implied licenses are granted. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works +thereof in any medium, with or without modifications, and in Source or Object +form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and You must cause any modified files to carry prominent notices +stating that You changed the files; and You must retain, in the Source form of +any Derivative Works that You distribute, all copyright, patent, trademark, +and attribution notices from the Source form of the Work, excluding those +notices that do not pertain to any part of the Derivative Works; and If the +Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of +the following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. You may add Your own copyright statement to Your +modifications and may provide additional or different license terms and +conditions for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in this +License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally +submitted for inclusion in the Work by You to the Licensor shall be under the +terms and conditions of this License, without any additional terms or +conditions. Notwithstanding the above, nothing herein shall supersede or +modify the terms of any separate license agreement you may have executed with +Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides +the Work (and each Contributor provides its Contributions) on an "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result of +this License or out of the use or inability to use the Work (including but not +limited to damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even if such +Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, and +only if You agree to indemnify, defend, and hold each Contributor harmless for +any liability incurred by, or claims asserted against, such Contributor by +reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Educational Community License to your work + +To apply the Educational Community License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" replaced with +your own identifying information. (Don't include the brackets!) The text +should be enclosed in the appropriate comment syntax for the file format. We +also recommend that a file or class name and description of purpose be +included on the same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright {yyyy} {name of copyright owner} Licensed under the Educational +Community License, Version 2.0 (the "License"); you may not use this file +except in compliance with the License. You may obtain a copy of the License at + +http://opensource.org/licenses/ECL-2.0 + + Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. From 52a73b82861d57985b0a33d861b34ac97c8cf522 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 17 Mar 2017 10:42:31 -0700 Subject: [PATCH 25/68] rm fields with default values --- _licenses/ecl-2.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index ba44158..3308275 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -2,8 +2,6 @@ title: Educational Community License v2.0 spdx-id: ECL-2.0 source: https://opensource.org/licenses/ECL-2.0 -featured: false -hidden: true description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. From 388396f93371efcfed1003e886204c76bb5554b1 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Fri, 17 Mar 2017 18:03:29 +0000 Subject: [PATCH 26/68] Dropped duplicate heading on ECL license. --- _licenses/ecl-2.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 3308275..955959e 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -31,8 +31,6 @@ limitations: - warranty --- -Educational Community License, Version 2.0 (ECL-2.0) - Educational Community License Version 2.0, April 2007 From 69ad10f6c9c8493f2bd108ae8598eabf149684a0 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Mar 2017 10:13:37 -0700 Subject: [PATCH 27/68] []->{} consistency in ECL-2.0 appendix See https://github.com/github/choosealicense.com/pull/494#issuecomment-287436948 and Apache-2.0 treatment here. --- _licenses/ecl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 955959e..c0d6909 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -216,7 +216,7 @@ END OF TERMS AND CONDITIONS APPENDIX: How to apply the Educational Community License to your work To apply the Educational Community License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" replaced with +boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be From 713b9b602042b9a3e38b14025ba5432454bbc12c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:41:20 -0700 Subject: [PATCH 28/68] Adding NCSA License --- _licenses/ncsa.txt | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 _licenses/ncsa.txt diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt new file mode 100644 index 0000000..ea687d4 --- /dev/null +++ b/_licenses/ncsa.txt @@ -0,0 +1,68 @@ +--- +title: University of Illinois/NCSA Open Source License +spdx-id: NCSA +nickname: UIUC/NCSA +source: https://opensource.org/licenses/NCSA +hidden: false +featured: false + +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. + +using: + - Clang: https://github.com/llvm-mirror/clang/blob/master/LICENSE.TXT + - LLVM: https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT + - LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT + +permissions: + - commercial-use + - modifications + - distribute + - private-use + +conditions: + - include-copyright + +limitations: + - trademark-use + - liability + - warranty + +--- + +University of Illinois/NCSA Open Source License + +Copyright (c) [year], [fullname] +All rights reserved. + +Developed by: [fullname] + [project] + [email] + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal with the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + +* Neither the names of [fullname], [project] nor the names of its + contributors may be used to endorse or promote products derived from + this Software without specific prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH +THE SOFTWARE. From e29f5d16d92290e9bb1f63cd1734bbb5531330c2 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:45:40 -0700 Subject: [PATCH 29/68] Update ncsa.txt --- _licenses/ncsa.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index ea687d4..f5e3845 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -36,9 +36,9 @@ University of Illinois/NCSA Open Source License Copyright (c) [year], [fullname] All rights reserved. -Developed by: [fullname] - [project] - [email] +Developed by: [fullname] + [project] + [email] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From d0af1481b0ccf341259081c65ee89cfd6816f946 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 18:51:32 -0700 Subject: [PATCH 30/68] links --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index f5e3845..54316ae 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. From cae5457dfa078190706d3a5fdc44cc4f86c47cdd Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 21:47:46 -0700 Subject: [PATCH 31/68] Update ncsa.txt --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 54316ae..63611e6 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. From 2247a46e7c6addc02e1f6c1e2c0dd0ae4f202bab Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 21:49:33 -0700 Subject: [PATCH 32/68] distibute -> distribution --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 63611e6..d1f4926 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -18,7 +18,7 @@ using: permissions: - commercial-use - modifications - - distribute + - distribution - private-use conditions: From c8ac7795747ba611ab2ca4db969405ab4bf8a5b4 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 22:50:03 -0700 Subject: [PATCH 33/68] fix links --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index d1f4926..9f727d5 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -6,7 +6,7 @@ source: https://opensource.org/licenses/NCSA hidden: false featured: false -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. From da0e011c66422d4ba9e279d8cce27c0ec70a8863 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Thu, 23 Mar 2017 23:19:04 -0700 Subject: [PATCH 34/68] Change hidden to true --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 9f727d5..b456023 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -3,7 +3,7 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -hidden: false +hidden: true featured: false description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. From abff65e95d8aa64cc1213519dda992966e09ee43 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Mar 2017 11:40:33 -0700 Subject: [PATCH 35/68] rm fields with default values --- _licenses/ncsa.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index b456023..c998864 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -3,8 +3,6 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -hidden: true -featured: false description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. From 8e08db2e2749d1516048a164a2b9480105d3cd5f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Mar 2017 11:47:47 -0700 Subject: [PATCH 36/68] rm trademark-use limitation; this just has a non-endorsement clause --- _licenses/ncsa.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index c998864..d40c0fe 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -23,7 +23,6 @@ conditions: - include-copyright limitations: - - trademark-use - liability - warranty From 27570c5e3f66feeed2e14143c32f6122adeec83c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:39:36 -0700 Subject: [PATCH 37/68] Added different projects and typo --- _licenses/ncsa.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index d40c0fe..37b42b4 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -4,14 +4,15 @@ spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. It's conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. using: - - Clang: https://github.com/llvm-mirror/clang/blob/master/LICENSE.TXT - - LLVM: https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT - LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT + - ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt + - RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE + permissions: - commercial-use From 19544b0112d71886b9ca944253d1b13968809e15 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:45:18 -0700 Subject: [PATCH 38/68] Matching SPDX over OSI --- _licenses/ncsa.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 37b42b4..680efa4 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -31,12 +31,9 @@ limitations: University of Illinois/NCSA Open Source License -Copyright (c) [year], [fullname] -All rights reserved. +Copyright (c) [year] [fullname]. All rights reserved. -Developed by: [fullname] - [project] - [email] +Developed by: [fullname] [project] [email] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From 7eb2639152e5892061e850bd64191e7fe2bf8f2c Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Fri, 24 Mar 2017 12:51:02 -0700 Subject: [PATCH 39/68] Update ncsa.txt --- _licenses/ncsa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 680efa4..48a9750 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -4,7 +4,7 @@ spdx-id: NCSA nickname: UIUC/NCSA source: https://opensource.org/licenses/NCSA -description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. By combining parts of these two licenses, it attempts to be clearer and more concise than either. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. +description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. From d818ba67faa70d0d0ba1eabc85bf3d16c245e784 Mon Sep 17 00:00:00 2001 From: Naren Dasan Date: Sat, 25 Mar 2017 13:15:30 -0700 Subject: [PATCH 40/68] update developed by --- _licenses/ncsa.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 48a9750..f1bd196 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -33,7 +33,9 @@ University of Illinois/NCSA Open Source License Copyright (c) [year] [fullname]. All rights reserved. -Developed by: [fullname] [project] [email] +Developed by: [fullname] + [project] + [project_url] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files From aeca75a53b7ea34231287670d4fc04adc0ad332c Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Mar 2017 16:56:26 -0700 Subject: [PATCH 41/68] Don't inlcude 'you' in any rule descriptions Descriptions should make sense whether reader is licensor or licensee --- README.md | 18 +++++++++--------- _data/rules.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 96069a4..206bb62 100644 --- a/README.md +++ b/README.md @@ -80,25 +80,25 @@ The license properties (rules) are stored as a bulleted list within the licenses * `commercial-use` - This software and derivatives may be used for commercial purposes. * `modifications` - This software may be modified. -* `distribution` - You may distribute this software. -* `private-use` - You may use and modify the software without distributing it. -* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient. +* `distribution` - This software may be distributed. +* `private-use` - This software may be used and modifed in private. +* `patent-use` - This license provides an express grant of patent rights from contributors. #### Conditions -* `include-copyright` - Include a copy of the license and copyright notice with the software. -* `document-changes` - Indicate changes made to the code. -* `disclose-source` - Source code must be made available when distributing the software. -* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. +* `include-copyright` - A copy of the license and copyright notice must be included with the software. +* `document-changes` - Changes made to the code must be documented. +* `disclose-source` - Source code must be made available the software is distributed. +* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. #### Limitations -* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. +* `trademark-use` - This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights. * `liability` - This license includes a limitation of liability. -* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. +* `patent-use` - This license explicitly states that it does NOT grant any rights in the patents of contributors. * `warranty` - The license explicitly states that it does NOT provide any warranty. ## License diff --git a/_data/rules.yml b/_data/rules.yml index 4f1c74d..96e5109 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -5,27 +5,27 @@ permissions: - description: This software may be modified. label: Modification tag: modifications -- description: You may distribute this software. +- description: This software may be distributed. label: Distribution tag: distribution -- description: You may use and modify the software without distributing it. +- description: This software may be used and modifed in private. label: Private use tag: private-use -- description: This license provides an express grant of patent rights from the contributor to the recipient. +- description: This license provides an express grant of patent rights from contributors. label: Patent use tag: patent-use conditions: -- description: Include a copy of the license and copyright notice with the software. +- description: A copy of the license and copyright notice must be included with the software. label: License and copyright notice tag: include-copyright -- description: Indicate changes made to the code. +- description: Changes made to the code must be documented. label: State changes tag: document-changes -- description: Source code must be made available when distributing the software. +- description: Source code must be made available the software is distributed. label: Disclose source tag: disclose-source -- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. +- description: Users who interact with the software via network are given the right to receive a copy of the source code. label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. @@ -39,13 +39,13 @@ conditions: tag: same-license--library limitations: -- description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. +- description: This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights. label: Trademark use tag: trademark-use - description: This license includes a limitation of liability. label: Liability tag: liability -- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. +- description: This license explicitly states that it does NOT grant any rights in the patents of contributors. label: Patent use tag: patent-use - description: The license explicitly states that it does NOT provide any warranty. From 75c05d717c054422222172d3c6befbc0289faf40 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Mar 2017 17:19:44 -0700 Subject: [PATCH 42/68] mindlessly satisfy rubocop 0.48 --- Gemfile | 1 + Rakefile | 3 ++- script/check-approval | 1 + script/generate-docs | 1 + spec/ci_ruby_version_spec.rb | 1 + spec/license_bom_spec.rb | 1 + spec/license_fields_spec.rb | 3 ++- spec/license_meta_spec.rb | 3 ++- spec/license_rules_spec.rb | 1 + spec/license_shown_spec.rb | 1 + spec/license_spec.rb | 1 + spec/spec_helper.rb | 3 ++- 12 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6285dab..84fd12d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ # frozen_string_literal: true + source 'https://rubygems.org' require 'json' diff --git a/Rakefile b/Rakefile index 01734ae..360bfdf 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'html-proofer' require 'rspec/core/rake_task' @@ -26,7 +27,7 @@ task :approved_licenses do puts approved.join(', ') puts "\n" - potential = approved - licenses.map { |l| l['id'] } + potential = approved - (licenses.map { |l| l['id'] }) puts "#{potential.count} potential additions:" puts potential.join(', ') end diff --git a/script/check-approval b/script/check-approval index 2e4c9d2..6b491db 100755 --- a/script/check-approval +++ b/script/check-approval @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + # Checks if a given license meets the approval criteria to be added to choosealicense.com # See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license # Usage: script/check-approval [SPDX LICENSE ID] diff --git a/script/generate-docs b/script/generate-docs index b4edae4..4940d69 100755 --- a/script/generate-docs +++ b/script/generate-docs @@ -1,5 +1,6 @@ #!/usr/bin/env ruby # frozen_string_literal: true + # Usage: script/generate-docs # Reads in the fields, meta, and rules YAML files and produces markdown output # suitable for documenting in the project's README diff --git a/spec/ci_ruby_version_spec.rb b/spec/ci_ruby_version_spec.rb index b61c7c5..6809848 100644 --- a/spec/ci_ruby_version_spec.rb +++ b/spec/ci_ruby_version_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'json' require 'open-uri' require 'spec_helper' diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index a3e2798..bed1d1e 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'byte order marks' do diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index bac33e9..4215f37 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license fillable fields' do @@ -6,7 +7,7 @@ describe 'license fillable fields' do context "The #{license['title']} license" do it 'should only contain supported fillable fields' do matches = license['content'].scan(/\[([a-z]+)\]/) - extra_fields = matches.flatten - fields.map { |f| f['name'] } + extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end end diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 60ea68b..2e5b8c3 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license meta' do @@ -8,7 +9,7 @@ describe 'license meta' do context "The #{license['title']} license" do it 'should only contain supported meta fields' do - extra_fields = raw_fields.keys - meta.map { |m| m['name'] } + extra_fields = raw_fields.keys - (meta.map { |m| m['name'] }) expect(extra_fields).to be_empty end diff --git a/spec/license_rules_spec.rb b/spec/license_rules_spec.rb index 83137c2..450c164 100644 --- a/spec/license_rules_spec.rb +++ b/spec/license_rules_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'license rules' do diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index d2b50e4..4ef3f8c 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'shown licenses' do diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 95e6f43..0fd8a96 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' describe 'licenses' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c99daf6..ab89492 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'jekyll' require 'open-uri' require 'json' @@ -42,7 +43,7 @@ def licenses end def shown_licenses - licenses.select { |l| !l['hidden'] } + licenses.reject { |l| l['hidden'] } end def site From ec57a36433aae65209f7c681e51573940eea4937 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 27 Mar 2017 08:35:39 -0700 Subject: [PATCH 43/68] spel --- README.md | 4 ++-- _data/rules.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 206bb62..d065437 100644 --- a/README.md +++ b/README.md @@ -81,14 +81,14 @@ The license properties (rules) are stored as a bulleted list within the licenses * `commercial-use` - This software and derivatives may be used for commercial purposes. * `modifications` - This software may be modified. * `distribution` - This software may be distributed. -* `private-use` - This software may be used and modifed in private. +* `private-use` - This software may be used and modified in private. * `patent-use` - This license provides an express grant of patent rights from contributors. #### Conditions * `include-copyright` - A copy of the license and copyright notice must be included with the software. * `document-changes` - Changes made to the code must be documented. -* `disclose-source` - Source code must be made available the software is distributed. +* `disclose-source` - Source code must be made available when the software is distributed. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. diff --git a/_data/rules.yml b/_data/rules.yml index 96e5109..75d08cb 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -8,7 +8,7 @@ permissions: - description: This software may be distributed. label: Distribution tag: distribution -- description: This software may be used and modifed in private. +- description: This software may be used and modified in private. label: Private use tag: private-use - description: This license provides an express grant of patent rights from contributors. @@ -22,7 +22,7 @@ conditions: - description: Changes made to the code must be documented. label: State changes tag: document-changes -- description: Source code must be made available the software is distributed. +- description: Source code must be made available when the software is distributed. label: Disclose source tag: disclose-source - description: Users who interact with the software via network are given the right to receive a copy of the source code. From d171cf3c2235ba5acd35cb10d51b47309229b49c Mon Sep 17 00:00:00 2001 From: floatingatoll Date: Sat, 8 Apr 2017 21:23:05 -0700 Subject: [PATCH 44/68] De-capitalize one mistakenly-capitalized 'License' The surround text (and following items) use the phrase "Same license" and no evidence is present of capitalization of License as a proper noun in this text. --- _data/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/rules.yml b/_data/rules.yml index 75d08cb..3a20f10 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -29,7 +29,7 @@ conditions: label: Network use is distribution tag: network-use-disclose - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License + label: Same license tag: same-license - description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. label: Same license (file) From aa33c8071bcecbf96f6153cdabaab9bf0d6e8bda Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 8 Apr 2017 22:40:27 -0700 Subject: [PATCH 45/68] satisfy rubocop 0.48.1 --- spec/license_shown_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 4ef3f8c..adf631f 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe 'shown licenses' do # Whitelist of popular licenses that are shown (non-hidden) # Note: most new licenses that are added should be hidden by default - SHOWN_LICENSES = %w( + SHOWN_LICENSES = %w[ agpl-3.0 apache-2.0 bsd-2-clause @@ -18,7 +18,7 @@ describe 'shown licenses' do mit mpl-2.0 unlicense - ).freeze + ].freeze it 'has the expected number of shown licenses' do expect(shown_licenses.count).to eql(12) From b225f1f94b0dd05ffc9bc4f91bc953c4c195f5a0 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 21 Apr 2017 18:20:47 -0700 Subject: [PATCH 46/68] Example project moved its license file, update --- _licenses/isc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 867a66a..fe62b9e 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - documentation.js: https://github.com/documentationjs/documentation/blob/master/LICENSE - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE - - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE + - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE.md permissions: - commercial-use From 3215952d39a2c38ab37123d70a1516c431f49e35 Mon Sep 17 00:00:00 2001 From: Evan Ogas Date: Wed, 17 May 2017 16:34:04 -0400 Subject: [PATCH 47/68] Fix .NET Core license.txt url --- _licenses/mit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mit.txt b/_licenses/mit.txt index ad07380..68784c8 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -11,7 +11,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - jQuery: https://github.com/jquery/jquery/blob/master/LICENSE.txt - - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE + - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE.TXT - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE permissions: From 00c95e4d77a9b511b111b231c3d1b12c57e5fb40 Mon Sep 17 00:00:00 2001 From: Basil Peace Date: Sun, 21 May 2017 18:12:26 +0300 Subject: [PATCH 48/68] Update external hyperlinks in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90e4d89..2c309e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ get. But first, please make sure you understand what Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or , and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: -1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception). +1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license). 2. The license must be listed on one of the following approved lists of licenses: * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical) * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) From ed8a4b497c2781b26da8bfa510d7ab744f18d00f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 27 May 2017 12:30:43 -0700 Subject: [PATCH 49/68] pages now using ruby 2.4.0 --- .rubocop.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 6c5cba1..fca3b19 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Exclude: - _site/**/* - vendor/**/* diff --git a/.travis.yml b/.travis.yml index edbe773..f35dbd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.3.3 + - 2.4.0 branches: only: From b3f003eba06f369011b34aa36e03f5a764e4ee96 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 27 May 2017 12:31:01 -0700 Subject: [PATCH 50/68] fix uncool EUPL link --- _licenses/eupl-1.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 5d5d30b..81fb2b2 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -2,7 +2,7 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -source: https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 +source: https://joinup.ec.europa.eu/community/eupl/og_page/eupl-text-11-12 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. From 1726b836bb43cc3cd991ef57fde1af5e9e78c478 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 30 May 2017 14:17:13 -0700 Subject: [PATCH 51/68] make `using` required for new licenses --- CONTRIBUTING.md | 1 + README.md | 2 +- _data/meta.yml | 8 ++++---- _licenses/afl-3.0.txt | 2 ++ _licenses/agpl-3.0.txt | 2 ++ _licenses/artistic-2.0.txt | 2 ++ _licenses/bsd-2-clause.txt | 2 ++ _licenses/bsd-3-clause-clear.txt | 2 ++ _licenses/bsd-3-clause.txt | 2 ++ _licenses/bsl-1.0.txt | 2 ++ _licenses/cc-by-4.0.txt | 2 ++ _licenses/cc-by-sa-4.0.txt | 2 ++ _licenses/cc0-1.0.txt | 2 ++ _licenses/eupl-1.1.txt | 2 ++ _licenses/lgpl-2.1.txt | 2 ++ _licenses/lgpl-3.0.txt | 2 ++ _licenses/lppl-1.3c.txt | 2 ++ _licenses/ms-pl.txt | 2 ++ _licenses/ms-rl.txt | 2 ++ _licenses/ncsa.txt | 1 - _licenses/ofl-1.1.txt | 2 ++ _licenses/wtfpl.txt | 2 ++ _licenses/zlib.txt | 2 ++ spec/license_meta_spec.rb | 28 ++++++++++++++++++++++++++++ 24 files changed, 72 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c309e1..6ee9bd9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,6 +20,7 @@ Choosealicense.com is intended to demystify license choices, not present or cata * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code) 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license +4. 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition: diff --git a/README.md b/README.md index d065437..999e90f 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `source` - The URL to the license source text * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license +* `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url` * `permissions` - Bulleted list of permission rules * `conditions` - Bulleted list of condition rules * `limitations` - Bulleted list of limitation rules @@ -54,7 +55,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) * `nickname` - Customary short name if applicable (e.g, GPLv3) * `note` - Additional information about the licenses -* `using` - A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url` * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs ### Auto-populated fields diff --git a/_data/meta.yml b/_data/meta.yml index fc97bd0..1668c04 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -33,6 +33,10 @@ description: Bulleted list of limited rules required: true +- name: using + description: 'A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`' + required: true + # Optional fields - name: featured @@ -51,10 +55,6 @@ description: Additional information about the licenses required: false -- name: using - description: 'A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`' - required: false - - name: redirect_from description: Relative path(s) to redirect to the license from, to prevent breaking old URLs required: false diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 07754dd..9fbfc86 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -7,6 +7,8 @@ description: The Academic Free License is a variant of the Open Software License how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index fe61572..6705c36 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -12,6 +12,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 755a4af..8b84ce1 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -8,6 +8,8 @@ description: Heavily favored by the Perl community, the Artistic license require how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code, and copy the text of the license into the file. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 73de9c3..597a03a 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -9,6 +9,8 @@ description: A permissive license that comes in two variants, the BSD 3-Clause Lic how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index f74002d..71f9235 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -8,6 +8,8 @@ description: A permissive license similar to the found on their website. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 81fb2b2..da10315 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -10,6 +10,8 @@ how: Create a text file (typically named COPYING or LICENCE.txt) in the root of note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index d1224d0..81c218e 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -12,6 +12,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index cea10cb..4006367 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -12,6 +12,8 @@ how: This license is an additional set of permissions to the GNU GPLv3 license. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 42d45c4..984bf3b 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -9,6 +9,8 @@ how: To use this license, place in each of the components of your work both an e note: An example boilerplate and more information about how to use the license can be found at the end of the license. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index dc1485a..5c26163 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -7,6 +7,8 @@ description: An open source license with a patent grant. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. +using: + permissions: - commercial-use - modifications diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 18ab1ca..a932c98 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -7,6 +7,8 @@ description: An open source license with a patent grant similar to the Date: Fri, 9 Jun 2017 09:59:16 +0200 Subject: [PATCH 54/68] Remove stacktrace.js as Unlicense example --- _licenses/unlicense.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index a5c8e26..00b8cab 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -10,7 +10,6 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - - stacktrace.js: https://github.com/stacktracejs/stacktrace.js/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE permissions: From 435252f5c0efcfa5477205f5e9d475aa807992ed Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 9 Jun 2017 10:49:50 +0200 Subject: [PATCH 55/68] Use docopt.rs as example for the Unlicense --- _licenses/unlicense.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 00b8cab..153051f 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -11,6 +11,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE + - docopt.rs: https://github.com/docopt/docopt.rs/blob/master/UNLICENSE permissions: - private-use From edf588b327159833201134de1af0f6acd0c73875 Mon Sep 17 00:00:00 2001 From: John Jago Date: Sat, 10 Jun 2017 12:45:38 -0500 Subject: [PATCH 56/68] Replace dual-licensed example with RDF.rb --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 153051f..2894fdb 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -11,7 +11,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE - - docopt.rs: https://github.com/docopt/docopt.rs/blob/master/UNLICENSE + - RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE permissions: - private-use From d7e5529839e4bdab87865213290585e71ae1a6ff Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sun, 18 Jun 2017 23:39:22 +0100 Subject: [PATCH 57/68] fix typo: soley --> solely --- _licenses/cc-by-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index d52cf7f..35beda5 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -5,7 +5,7 @@ source: https://creativecommons.org/licenses/by/4.0/legalcode.txt description: Permits almost any use subject to providing credit and license notice. Frequently used for media assets and educational materials. The most common license for Open Access scientific publications. Not recommended for software. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: From 22dc2dbe3628b5aae621c508dadd82dcfb173b8e Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sun, 18 Jun 2017 23:40:11 +0100 Subject: [PATCH 58/68] fix typo: soley --> solely --- _licenses/cc-by-sa-4.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 2a6da7d..ec3451d 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -5,7 +5,7 @@ source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same or a similar, compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. -how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the canonical URL for the license. +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: From 22a9b2bc80ae82e0d629ff2c09f48434472a8fae Mon Sep 17 00:00:00 2001 From: Haralan Dobrev Date: Tue, 20 Jun 2017 22:30:04 +0300 Subject: [PATCH 59/68] Link to unlicense.org on HTTPS --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 2894fdb..2c94391 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -50,4 +50,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -For more information, please refer to +For more information, please refer to From 9d49847a8af2cd9a0787f269f6899461ad045aeb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 20 Jun 2017 13:35:28 -0700 Subject: [PATCH 60/68] clarify what open license for documentation means Fix #521 --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 8bcade8..604d57c 100644 --- a/non-software.md +++ b/non-software.md @@ -12,7 +12,7 @@ Open source software licenses can be used for non-software works, and often are ### Documentation -Any open source software license or open Creative Commons license is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. +Any open source software license or open license for media (see above) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. ### Fonts From 31803c88eca1e44e3e097847a2afd0fdbca5a10a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 20 Jun 2017 13:37:11 -0700 Subject: [PATCH 61/68] internal link for zero ambiguity --- non-software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/non-software.md b/non-software.md index 604d57c..e235a15 100644 --- a/non-software.md +++ b/non-software.md @@ -12,7 +12,7 @@ Open source software licenses can be used for non-software works, and often are ### Documentation -Any open source software license or open license for media (see above) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. +Any open source software license or open license for media (see [above](#data-media-etc)) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license. ### Fonts From fda503385db4871b36a893044da4859b894758b5 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:24:51 +0200 Subject: [PATCH 62/68] Initial revision --- _licenses/postgresql.txt | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 _licenses/postgresql.txt diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt new file mode 100644 index 0000000..9705e18 --- /dev/null +++ b/_licenses/postgresql.txt @@ -0,0 +1,50 @@ +--- +title: PostreSQL License +spdx-id: PostgreSQL +source: https://opensource.org/licenses/PostgreSQL +featured: false +hidden: true + +description: A very short, BSD-style license, used specifically for PostgreSQL. + +how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. + +using: + - PostgreSQL: https://www.postgresql.org/about/licence/ + - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +The PostgreSQL Licence (PostgreSQL) + +Copyright (c) [year] [organisation] + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement is +hereby granted, provided that the above copyright notice and this paragraph +and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, +AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +ENHANCEMENTS, OR MODIFICATIONS. From 8625394f3bf659bce9a1771bb97707429a170484 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:30:16 +0200 Subject: [PATCH 63/68] Fix license name --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 9705e18..dff79ee 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -1,5 +1,5 @@ --- -title: PostreSQL License +title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL featured: false From 82e4edbb60eebde8a0792a2bdbf1f320db5ff1b7 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:36:26 +0200 Subject: [PATCH 64/68] Use allowed fileds --- _licenses/postgresql.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index dff79ee..f57fd21 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -31,19 +31,19 @@ limitations: The PostgreSQL Licence (PostgreSQL) -Copyright (c) [year] [organisation] +Copyright (c) [year] [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +IN NO EVENT SHALL [fullname] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [fullname] HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +[fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, From 2e6e50f00f207823ff52eecae50eb5cbcb9d06fe Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Sat, 24 Jun 2017 23:02:26 +0200 Subject: [PATCH 65/68] Provide examples compatible with license template --- _licenses/postgresql.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index f57fd21..6374556 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -10,8 +10,8 @@ description: A very short, BSD-style license, used specifically for PostgreSQL. how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. using: - - PostgreSQL: https://www.postgresql.org/about/licence/ - - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE + - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt permissions: @@ -29,7 +29,7 @@ limitations: --- -The PostgreSQL Licence (PostgreSQL) +PostgreSQL Licence Copyright (c) [year] [fullname] From b8006f70d1230c2f303450eb9d5092b2222c4c44 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 25 Jun 2017 13:56:27 -0700 Subject: [PATCH 66/68] rm fields with default values --- _licenses/postgresql.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 6374556..da677eb 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -2,8 +2,6 @@ title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL -featured: false -hidden: true description: A very short, BSD-style license, used specifically for PostgreSQL. From 8d7d579c3aa5ebb2613d58daae40c997afc8d48e Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:13:01 +0200 Subject: [PATCH 67/68] Add missing [fullname] field --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index da677eb..ca924ba 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -44,5 +44,5 @@ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, -AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +AND [fullname] HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. From 4df304625c524e99e9e19900dd49c3765a9599a1 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:20:18 +0200 Subject: [PATCH 68/68] Update according to https://fedoraproject.org/wiki/Licensing/PostgreSQL_License --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index ca924ba..67e90d7 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -29,7 +29,7 @@ limitations: PostgreSQL Licence -Copyright (c) [year] [fullname] +Copyright (c) [year], [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is