From fa93f75dafeb200b093a531d7fa6420534dd029b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Jul 2020 12:52:33 -0700 Subject: [PATCH 1/4] Generalize software->licensed material in permission/condition/limitiation descriptions Fixes #743 --- _data/rules.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index 1f315b6..5c9a1dd 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,14 +1,14 @@ permissions: -- description: This software and derivatives may be used for commercial purposes. +- description: This licensed material and derivatives may be used for commercial purposes. label: Commercial use tag: commercial-use -- description: This software may be modified. +- description: This licensed material may be modified. label: Modification tag: modifications -- description: This software may be distributed. +- description: This licensed material may be distributed. label: Distribution tag: distribution -- description: This software may be used and modified in private. +- description: This licensed material 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. @@ -16,28 +16,28 @@ permissions: tag: patent-use conditions: -- description: A copy of the license and copyright notice must be included with the software. +- description: A copy of the license and copyright notice must be included with the licensed material. label: License and copyright notice tag: include-copyright -- description: A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. +- description: A copy of the license and copyright notice must be included with the licensed material in source form, but is not required for binaries. label: License and copyright notice for source tag: include-copyright--source - description: Changes made to the code must be documented. label: State changes tag: document-changes -- description: Source code must be made available when the software is distributed. +- description: Source code must be made available when the licensed material 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. +- description: Users who interact with the licensed material 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. +- description: Modifications must be released under the same license when distributing the licensed material. 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. +- description: Modifications of existing files must be released under the same license when distributing the licensed material. 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. +- description: Modifications must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use the licensed material as a library. label: Same license (library) tag: same-license--library From bc6e57a844d675d968fa1dd4eb019bccc26844ca Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 25 Jul 2020 16:42:11 -0700 Subject: [PATCH 2/4] rm unhelpful articles and demonstratives --- _data/rules.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index 5c9a1dd..a7a56e6 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,14 +1,14 @@ permissions: -- description: This licensed material and derivatives may be used for commercial purposes. +- description: Licensed material and derivatives may be used for commercial purposes. label: Commercial use tag: commercial-use -- description: This licensed material may be modified. +- description: Licensed material may be modified. label: Modification tag: modifications -- description: This licensed material may be distributed. +- description: Licensed material may be distributed. label: Distribution tag: distribution -- description: This licensed material may be used and modified in private. +- description: Licensed material 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. @@ -16,28 +16,28 @@ permissions: tag: patent-use conditions: -- description: A copy of the license and copyright notice must be included with the licensed material. +- description: A copy of the license and copyright notice must be included with licensed material. label: License and copyright notice tag: include-copyright -- description: A copy of the license and copyright notice must be included with the licensed material in source form, but is not required for binaries. +- description: A copy of the license and copyright notice must be included with licensed material in source form, but is not required for binaries. label: License and copyright notice for source tag: include-copyright--source -- description: Changes made to the code must be documented. +- description: Changes made to licended material must be documented. label: State changes tag: document-changes -- description: Source code must be made available when the licensed material is distributed. +- description: Source code must be made available when licensed material is distributed. label: Disclose source tag: disclose-source -- description: Users who interact with the licensed material via network are given the right to receive a copy of the source code. +- description: Users who interact with licensed material via network are given the right to receive a copy of source code. label: Network use is distribution tag: network-use-disclose -- description: Modifications must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used. +- description: Modifications must be released under the same license when distributing licensed material. 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 licensed material. In some cases a similar or related license may be used. +- description: Modifications of existing files must be released under the same license when distributing licensed material. 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 licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use the licensed material as a library. +- description: Modifications must be released under the same license when distributing licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use licensed material as a library. label: Same license (library) tag: same-license--library From e94c302194afa820b06cbbd94767ba664df6329a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Jul 2020 12:08:18 -0700 Subject: [PATCH 3/4] re add articles, this license consistency --- _data/rules.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index a7a56e6..c15f4f1 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,14 +1,14 @@ permissions: -- description: Licensed material and derivatives may be used for commercial purposes. +- description: The licensed material and derivatives may be used for commercial purposes. label: Commercial use tag: commercial-use -- description: Licensed material may be modified. +- description: The licensed material may be modified. label: Modification tag: modifications -- description: Licensed material may be distributed. +- description: The licensed material may be distributed. label: Distribution tag: distribution -- description: Licensed material may be used and modified in private. +- description: The licensed material 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. @@ -16,28 +16,28 @@ permissions: tag: patent-use conditions: -- description: A copy of the license and copyright notice must be included with licensed material. +- description: A copy of the license and copyright notice must be included with the licensed material. label: License and copyright notice tag: include-copyright -- description: A copy of the license and copyright notice must be included with licensed material in source form, but is not required for binaries. +- description: A copy of the license and copyright notice must be included with the licensed material in source form, but is not required for binaries. label: License and copyright notice for source tag: include-copyright--source -- description: Changes made to licended material must be documented. +- description: Changes made to the licended material must be documented. label: State changes tag: document-changes -- description: Source code must be made available when licensed material is distributed. +- description: Source code must be made available when the licensed material is distributed. label: Disclose source tag: disclose-source -- description: Users who interact with licensed material via network are given the right to receive a copy of source code. +- description: Users who interact with the licensed material 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 licensed material. In some cases a similar or related license may be used. +- description: Modifications must be released under the same license when distributing the licensed material. 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 licensed material. In some cases a similar or related license may be used. +- description: Modifications of existing files must be released under the same license when distributing the licensed material. 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 licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use licensed material as a library. +- description: Modifications must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use the licensed material as a library. label: Same license (library) tag: same-license--library @@ -51,6 +51,6 @@ limitations: - 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. +- description: This license explicitly states that it does NOT provide any warranty. label: Warranty tag: warranty From 8d8eeee9ffe4b94508c189cce7a26ff4574269bc Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Jul 2020 12:11:00 -0700 Subject: [PATCH 4/4] spel --- _data/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/rules.yml b/_data/rules.yml index c15f4f1..54e4504 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -22,7 +22,7 @@ conditions: - description: A copy of the license and copyright notice must be included with the licensed material in source form, but is not required for binaries. label: License and copyright notice for source tag: include-copyright--source -- description: Changes made to the licended material must be documented. +- description: Changes made to the licensed material must be documented. label: State changes tag: document-changes - description: Source code must be made available when the licensed material is distributed.