From 6e6ffb80cd973f2b0a7133c95015ded055b93e85 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 26 Feb 2020 19:24:30 +0100 Subject: [Docs] Minor update and correction of some LICENSE files. --- LICENSE | 22 ++++++++++------------ basilisk/LICENSE | 6 +++--- basilisk/branding/unofficial/LICENSE | 3 +-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index c180917..cf6c7e1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,12 @@ -Please see the file toolkit/content/license.html for the copyright licensing -conditions attached to this codebase, including copies of the licenses -concerned. - -For more information about source code licensing, see: -http://www.palemoon.org/licensing.shtml +The majority of this code base is licensed under the Mozilla Public License 2.0. +You can obtain a copy of this license at http://mozilla.org/MPL/2.0/ You are not granted rights or licenses to the intellectual property or trademarks -of the Mozilla Foundation, Moonchild Productions, or any other party, including -without limitation the Pale Moon name or logo. - -Binary versions of Pale Moon are subject to the Pale Moon redistribution license. -For more information, see: http://www.palemoon.org/redist.shtml - +contained in this repository. +Please see the individual licensing documents in various directories for details +about applicable licenses to branding materials and binaries containing such +branding. + +Please note that the platform code that this application builds on has its own +set of licenses that must be taken into account for use and distribution of the +resulting binaries of this application. \ No newline at end of file diff --git a/basilisk/LICENSE b/basilisk/LICENSE index 4f643a5..f2d7bda 100644 --- a/basilisk/LICENSE +++ b/basilisk/LICENSE @@ -1,6 +1,6 @@ -Please see the file ../toolkit/content/license.html for the copyright -licensing conditions attached to this codebase, including copies of the -licenses concerned. +Please see the file ../platform/toolkit/content/license.html for the +copyright licensing conditions attached to the platform codebase, +including copies of the licenses concerned. You are not granted rights or licenses to the trademarks of Moonchild Productions or any other party, including without limitation the diff --git a/basilisk/branding/unofficial/LICENSE b/basilisk/branding/unofficial/LICENSE index 35dec18..3b78d67 100644 --- a/basilisk/branding/unofficial/LICENSE +++ b/basilisk/branding/unofficial/LICENSE @@ -1,8 +1,7 @@ The Serpent application name and Serpent logo are licensed under a Creative Commons Attribution license. -The Serpent logo is derived from "Sea Serpent" - by Lorc, +The Serpent logo is derived from "Sea Serpent" by Lorc, licensed under the Creative Commons license CC-BY 3.0 Branding files are created by M. Straver and similarly released -- cgit v1.2.3