From 5dbaa449d896cfb130f1aa6983cc8781cd6d34fb Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Thu, 19 Dec 2024 17:59:30 +0800 Subject: [PATCH 1/4] Correct title for cc-by-nd-2.5 From the source license link, we can see the title name is "Attribution-NoDerivs 2.5 Generic" and we missing the key word Generic --- src/CC-BY-ND-2.5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CC-BY-ND-2.5.xml b/src/CC-BY-ND-2.5.xml index d6ef92f0f..6ee48229b 100644 --- a/src/CC-BY-ND-2.5.xml +++ b/src/CC-BY-ND-2.5.xml @@ -7,7 +7,7 @@ -

Creative Commons Attribution-NoDerivs 2.5

+

Creative Commons Attribution-NoDerivs 2.5 Generic

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS From 2eafe2f0f6e35245253108834d7897ec249d433b Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Fri, 20 Dec 2024 22:48:05 +0800 Subject: [PATCH 2/4] also change test data --- test/simpleTestForGenerator/Elastic-2.0.txt | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/simpleTestForGenerator/Elastic-2.0.txt b/test/simpleTestForGenerator/Elastic-2.0.txt index 809108b85..949695567 100644 --- a/test/simpleTestForGenerator/Elastic-2.0.txt +++ b/test/simpleTestForGenerator/Elastic-2.0.txt @@ -2,18 +2,18 @@ Elastic License 2.0 URL: https://www.elastic.co/licensing/elastic-license -## Acceptance +Acceptance By using the software, you agree to all of the terms and conditions below. -## Copyright License +Copyright License The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below. -## Limitations +Limitations You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of @@ -27,7 +27,7 @@ You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law. -## Patents +Patents The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for @@ -40,7 +40,7 @@ the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company. -## Notices +Notices You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms. @@ -53,7 +53,7 @@ software prominent notices stating that you have modified the software. These terms do not imply any licenses other than those expressly granted in these terms. -## Termination +Termination If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you @@ -63,31 +63,31 @@ reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently. -## No Liability +No Liability -*As far as the law allows, the software comes as is, without any warranty or +As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of -legal claim.* +legal claim. -## Definitions +Definitions -The **licensor** is the entity offering these terms, and the **software** is the +The licensor is the entity offering these terms, and the software is the software the licensor makes available under these terms, including any portion of it. -**you** refers to the individual or entity agreeing to these terms. +you refers to the individual or entity agreeing to these terms. -**your company** is any legal entity, sole proprietorship, or other kind of +your company is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that -organization. **control** means ownership of substantially all the assets of an +organization. control means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect. -**your licenses** are all the licenses granted to you for the software under +your licenses are all the licenses granted to you for the software under these terms. -**use** means anything you do with the software requiring one of your licenses. +use means anything you do with the software requiring one of your licenses. -**trademark** means trademarks, service marks, and similar rights. +trademark means trademarks, service marks, and similar rights. From 4096572a8b050062dbaef07f88da68a16428aea7 Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Fri, 20 Dec 2024 23:00:25 +0800 Subject: [PATCH 3/4] Revert "also change test data" This reverts commit 2eafe2f0f6e35245253108834d7897ec249d433b. --- test/simpleTestForGenerator/Elastic-2.0.txt | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/simpleTestForGenerator/Elastic-2.0.txt b/test/simpleTestForGenerator/Elastic-2.0.txt index 949695567..809108b85 100644 --- a/test/simpleTestForGenerator/Elastic-2.0.txt +++ b/test/simpleTestForGenerator/Elastic-2.0.txt @@ -2,18 +2,18 @@ Elastic License 2.0 URL: https://www.elastic.co/licensing/elastic-license -Acceptance +## Acceptance By using the software, you agree to all of the terms and conditions below. -Copyright License +## Copyright License The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below. -Limitations +## Limitations You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of @@ -27,7 +27,7 @@ You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law. -Patents +## Patents The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for @@ -40,7 +40,7 @@ the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company. -Notices +## Notices You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms. @@ -53,7 +53,7 @@ software prominent notices stating that you have modified the software. These terms do not imply any licenses other than those expressly granted in these terms. -Termination +## Termination If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you @@ -63,31 +63,31 @@ reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently. -No Liability +## No Liability -As far as the law allows, the software comes as is, without any warranty or +*As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of -legal claim. +legal claim.* -Definitions +## Definitions -The licensor is the entity offering these terms, and the software is the +The **licensor** is the entity offering these terms, and the **software** is the software the licensor makes available under these terms, including any portion of it. -you refers to the individual or entity agreeing to these terms. +**you** refers to the individual or entity agreeing to these terms. -your company is any legal entity, sole proprietorship, or other kind of +**your company** is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that -organization. control means ownership of substantially all the assets of an +organization. **control** means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect. -your licenses are all the licenses granted to you for the software under +**your licenses** are all the licenses granted to you for the software under these terms. -use means anything you do with the software requiring one of your licenses. +**use** means anything you do with the software requiring one of your licenses. -trademark means trademarks, service marks, and similar rights. +**trademark** means trademarks, service marks, and similar rights. From 7c1db85ad1f4ef9b861dfce5f2172d611e997a1a Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Fri, 20 Dec 2024 23:02:44 +0800 Subject: [PATCH 4/4] also change test data --- test/simpleTestForGenerator/CC-BY-ND-2.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/simpleTestForGenerator/CC-BY-ND-2.5.txt b/test/simpleTestForGenerator/CC-BY-ND-2.5.txt index 2f6b29acf..69e476834 100644 --- a/test/simpleTestForGenerator/CC-BY-ND-2.5.txt +++ b/test/simpleTestForGenerator/CC-BY-ND-2.5.txt @@ -1,4 +1,4 @@ -Creative Commons Attribution-NoDerivs 2.5 +Creative Commons Attribution-NoDerivs 2.5 Generic CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.