0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docs: Include link to trademark guidelines in README and LICENSE files

Browse source
This commit is contained in:
Michael Mayer 2021-12-20 18:49:55 +01:00
parent 1703509623
commit fe06501bd7
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
LICENSE
View file

@ -660,9 +660,17 @@ if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
Trademarks
PhotoPrism® Trademark
PhotoPrism® is a registered trademark of Michael Mayer. You may use it
as required to describe our software, run your own server, for educational
purposes, but not for offering commercial goods, products, or services
without prior written permission. In other words, please ask.
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.
Third parties, including licensees, may never claim ownership of PhotoPrism's
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.
Visit <https://photoprism.app/trademark> to learn more.

7
README.md
View file

@ -130,9 +130,10 @@ on our side. If it's not just a small fix, it can take several months.**
## Trademark Guidelines ##
PhotoPrism® is a registered trademark. It is important to us that [any permitted use is fair](https://photoprism.app/trademark)
and meets the highest standards. To ensure this, we reserve the right to revoke your permission to use our brand assets
at any time and for any reason.
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.
[wiki:classification]: https://github.com/photoprism/photoprism/wiki/Image-Classification
[wiki:xmp]: https://github.com/photoprism/photoprism/wiki/XMP

6
assets/LICENSE
View file

@ -6,5 +6,7 @@ holder, you are advised to ask before using them for your own private or commerc
Visit https://docs.photoprism.app/credits/ for more information about images and other artwork.
PhotoPrism® is a registered trademark of Michael Mayer. By using our software, you agree to our
terms & conditions: https://photoprism.app/terms
PhotoPrism® is a registered trademark. It is important to us that any permitted use is fair and
meets the highest standards.
Visit https://photoprism.app/trademark to read our trademark and brand guidelines.