From 781d8e8a030bf25107bea1f7a8c45756f06a3f83 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sat, 25 Dec 2021 20:01:34 +0100 Subject: [PATCH] Docs: Update trademark info Signed-off-by: Michael Mayer --- LICENSE | 21 ++++++++++++++------- README.md | 8 +++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/LICENSE b/LICENSE index 17129b27c..3fe20650c 100644 --- a/LICENSE +++ b/LICENSE @@ -662,15 +662,22 @@ For more information on this, and how to apply and follow the GNU AGPL, see PhotoPrism® Trademark -You may not include the PhotoPrism trademark in the name of your app, product -or service, whether commercial or non-commercial in nature. This includes online -services such as e-commerce, community, blog, information, advertising, -and personal home pages, as well as apps, client apps, or third-party apps -that interact with PhotoPrism. +PhotoPrism® is a registered trademark. PhotoPrism’s Brand Assets — including +trademarks, logos, icons, designs, fonts, products, services, and any other +brand features and elements, whether registered or unregistered („Brand Assets“) +— are proprietary assets owned exclusively by Michael Mayer and his legal +successors („PhotoPrism“). Third parties, including licensees, may never claim ownership of PhotoPrism's -brand assets or brands confusingly similar to PhotoPrism's brand assets in any +Brand Assets or brands confusingly similar to PhotoPrism's Brand Assets in any way, including, without limitation, as a trademark, service mark, company name -or designation, domain name, social media profile/handle, or otherwise. +or designation, domain name, social media profile/handle, or in any other manner. +You may not include the PhotoPrism trademark in the name of your app, product +or service, whether commercial or non-commercial in nature. This includes online +services such as e-commerce, community, blog, information, advertising, and personal +home pages, as well as apps, client apps, or third-party apps that interact with +PhotoPrism. + +We reserve the right to object to any use or misuse in any jurisdiction worldwide. Visit to learn more. diff --git a/README.md b/README.md index 868d7af31..10b7f29c9 100644 --- a/README.md +++ b/README.md @@ -129,10 +129,12 @@ bug fixes, and documentation improvements. **Reviewing, testing and finally merging pull requests requires significant resources on our side. If it's not just a small fix, it can take several months.** -## Trademark Guidelines ## +## PhotoPrism® Trademark ## -PhotoPrism® is a registered trademark. It is important to us that any permitted use is fair and meets -the highest standards. Visit [photoprism.app/trademark](https://photoprism.app/trademark) to learn more. +Our [trademark and brand guidelines](https://photoprism.app/trademark), which may be updated +from time to time, describe how our Brand Assets may be used. It is important to us that any +permitted use of our Brand Assets is fair and meets the highest standards. To ensure this, +we reserve the right to object to any use or misuse in any jurisdiction worldwide. [wiki:classification]: https://github.com/photoprism/photoprism/wiki/Image-Classification [wiki:xmp]: https://github.com/photoprism/photoprism/wiki/XMP