From f8e1d89446da6763a0d86b2476eadb56b8aaa442 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Wed, 31 Oct 2018 12:46:25 +0100 Subject: [PATCH 1/3] use Apache License 2.0 verbatim text. The final text where we were adding year and copyright holder name is just *an appendix about how to add a notice*, not the notice itself. As found in https://www.apache.org/licenses/LICENSE-2.0.txt Signed-off-by: Santiago M. Mola --- engineering/documents/apache/LICENSE | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engineering/documents/apache/LICENSE b/engineering/documents/apache/LICENSE index 6d972e26..d6456956 100644 --- a/engineering/documents/apache/LICENSE +++ b/engineering/documents/apache/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 Sourced Technologies, S.L. + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -198,4 +199,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. From 4da7eb65cd5dd748d7f6f33bb7597c0921eae622 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Wed, 31 Oct 2018 12:53:37 +0100 Subject: [PATCH 2/3] use GPLv3 verbatim text As found in https://www.gnu.org/licenses/gpl-3.0.txt Signed-off-by: Santiago M. Mola --- engineering/documents/gpl/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engineering/documents/gpl/LICENSE b/engineering/documents/gpl/LICENSE index 097f4a29..f288702d 100644 --- a/engineering/documents/gpl/LICENSE +++ b/engineering/documents/gpl/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) 2017 Sourced Technologies, S.L. + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". 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 GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. \ No newline at end of file +. From 5cd7e628ecf906c4d493515003e13a58f62aaa7f Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Wed, 31 Oct 2018 12:55:46 +0100 Subject: [PATCH 3/3] use cc-by-sa 4.0 int. verbatim text As found tin https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt Signed-off-by: Santiago M. Mola --- engineering/documents/cc-by-sa/LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engineering/documents/cc-by-sa/LICENSE b/engineering/documents/cc-by-sa/LICENSE index 2e72ca11..fe8dbc50 100644 --- a/engineering/documents/cc-by-sa/LICENSE +++ b/engineering/documents/cc-by-sa/LICENSE @@ -48,7 +48,7 @@ exhaustive, and do not form part of our licenses. rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More_considerations + respect those requests where reasonable. More considerations for the public: wiki.creativecommons.org/Considerations_for_licensees @@ -425,3 +425,4 @@ the avoidance of doubt, this paragraph does not form part of the public licenses. Creative Commons may be contacted at creativecommons.org. +