From 57f7891273607feecdeeb968a1adedb38331f8eb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 12 Dec 2016 14:29:25 -0800 Subject: [PATCH 1/2] 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 2/2] 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