From 04eb3f3c2256f5259d3cc3bed9e3391a40b358c4 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 31 May 2022 05:24:10 +0900 Subject: [PATCH] [legal] Update trademark policy and guidelines, fix license text --- LICENSE | 23 +++++++----- .../app/components/about/about.component.html | 36 +++++++------------ .../trademark-policy.component.html | 3 +- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/LICENSE b/LICENSE index 966417847..1da08f458 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -The Mempool Open Source Project -Copyright (c) 2019-2022 The Mempool Open Source Project Developers +The Mempool Open Source Project™ +Copyright (c) 2019-2022 Mempool Space K.K. and other shadowy super-coders This program is free software; you can redistribute it and/or modify it under the terms of (at your option) either: @@ -12,13 +12,18 @@ the terms of (at your option) either: Foundation, either version 3 of the License or any later version approved by a proxy statement published on . -However, this copyright license does not include an implied right or license to -use our trademarks: The Mempool Open Source Project™, mempool.space™, the -mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal -Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered -trademarks or trademarks of Mempool Space K.K in Japan, the United States, -and/or other countries. See our full Trademark Policy and Guidelines for more -details, published on . +However, the above copyright licenses do not include an implied right or license +to use any trademarks, service marks, logos, or trade names of Mempool Space K.K. +or any other contributor to The Mempool Open Source Project. + +The Mempool Open Source Project™, Mempool Accelerator™, mempool.space™, +the mempool Logo, the mempool Square logo, the mempool Blocks logo, +the mempool.space Vertical Logo, and the mempool.space Horizontal logo +are registered trademarks or trademarks of Mempool Space K.K in Japan, +the United States, and/or other countries. + +See our full Trademark Policy and Guidelines for more details, published on +. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e09eddc78..20da28190 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -351,38 +351,26 @@
-
+

The Mempool Open Source Project

+

Copyright © 2019-2022
- The Mempool Open Source Project -

-

- The Mempool Open Source Project is free software; you can redistribute it and/or modify it under the terms of (at your option) either:
-

-
    -
  • - 1) the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License or any later version approved by a proxy statement published on <https://mempool.space/about>; or
    -
    • -
  • - 2) the GNU General Public License as published by the Free Software Foundation, either version 3 of the License or any later version approved by a proxy statement published on <https://mempool.space/about>.
    -
    • -
-

- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the full license terms for more details.
-

-
- Trademark Notice
-
-

- The Mempool Open Source Project™, mempool.space™, the mempool logo™, the mempool.space logos™, the mempool square logo™, and the mempool blocks logo™ are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries. + Mempool Space K.K.
+ and other shadowy super-coders

- While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our Trademark Policy and Guidelines for more details, published on <https://mempool.space/trademark-policy>. + The Mempool Open Source Project™, Mempool Accelerator™, mempool.space™, the mempool logo, the mempool.space logos, the mempool square logo, and the mempool blocks logo; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries. +

+

+ See our Trademark Policy and Guidelines for more details, published on <https://mempool.space/trademark-policy>. +

+

+ This program incorporates software and other components licensed from third parties. See the full list of Third-party Licenses for legal notices from those projects.

- Third-party Licenses Terms of Service + Privacy Policy
diff --git a/frontend/src/app/components/trademark-policy/trademark-policy.component.html b/frontend/src/app/components/trademark-policy/trademark-policy.component.html index 4526a6c0c..e7d9b7fc1 100644 --- a/frontend/src/app/components/trademark-policy/trademark-policy.component.html +++ b/frontend/src/app/components/trademark-policy/trademark-policy.component.html @@ -8,7 +8,7 @@

Trademark Policy and Guidelines

The Mempool Open Source Project ™
-
Updated: July 19, 2021
+
Updated: May 31, 2022

@@ -56,6 +56,7 @@ Mempool Space K.K. The Mempool Open Source Project + Mempool Accelerator mempool.space