From 6e681ec95d270a1eb20d10f84c6a2cde1bdabce3 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 23 Jun 2020 14:32:04 +0200 Subject: [PATCH] Update LICENSE: Move trademark info to the bottom Original license should not be changed, so it's better to append additional conditions. Signed-off-by: Michael Mayer --- LICENSE | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index d0fc01cb1..13b12127b 100644 --- a/LICENSE +++ b/LICENSE @@ -5,13 +5,6 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Trademarks - - 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. - Preamble The GNU Affero General Public License is a free, copyleft license for @@ -624,3 +617,52 @@ Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + 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 + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +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 +. + + Trademarks + + 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.