Issue #7 - Update LICENSE files and some copyright info

6 files changed, 16 insertions, 13 deletions

diff --git a/basilisk/LICENSE b/basilisk/LICENSE
index f2d7bda..3312653 100644
--- a/basilisk/LICENSE
+++ b/basilisk/LICENSE
@@ -3,8 +3,8 @@ 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
-Basilisk name or logo.
+Productions, Basilisk-Dev, or any other party, including without
+limitation the Basilisk name or logo.
 
 The Serpent logo in branding/unofficial is derived from "Sea Serpent"
 by Lorc, licensed under the Creative Commons license CC-BY 3.0
diff --git a/basilisk/base/content/aboutDialog.xul b/basilisk/base/content/aboutDialog.xul
index b1fcd6a..70a2c74 100644
--- a/basilisk/base/content/aboutDialog.xul
+++ b/basilisk/base/content/aboutDialog.xul
@@ -124,14 +124,14 @@
           </vbox>
 #ifdef MC_PRIVATE_BUILD
 <description class="text-blurb" id="communityDesc">
-              This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.basilisk-browser.org/">Basilisk website</label>.
+              This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://basilisk-browser.org/">Basilisk website</label>.
           </description>
 #else
           <description class="text-blurb" id="communityDesc">
-              Basilisk is community software released by <label class="text-link" href="http://www.palemoon.org/">the Pale Moon team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software.
+			  Basilisk is community software released by <label class="text-link" href="https://basilisk-browser.org/">the Basilisk Browser team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. Basilisk was formerly developed by the <a href="https://www.palemoon.org">Pale Moon</a> team. Without them this project would not exist. Thank you to Moonchild and others for your work on Basilisk over the years.
           </description>
           <description class="text-blurb" id="contributeDesc">
-              Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://repo.palemoon.org/MoonchildProductions/UXP">development</label> of the Unified XUL Platform.
+              Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating to the Pale Moon project</label> or get involved with the <label class="text-link" href="https://repo.palemoon.org/MoonchildProductions/UXP">development</label> of the Unified XUL Platform.
           </description>
 #endif
         </vbox>
diff --git a/basilisk/base/content/overrides/app-license.html b/basilisk/base/content/overrides/app-license.html
index 0a1f0d8..286b2d4 100644
--- a/basilisk/base/content/overrides/app-license.html
+++ b/basilisk/base/content/overrides/app-license.html
@@ -2,6 +2,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
     <p><b>Binaries</b> of this product have been made available to you by the
-    <a href="http://www.palemoon.org/">Pale Moon project team</a> and
-    <a href="http://www.moonchildproductions.info/">Moonchild Productions</a> under the Mozilla
-    Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>
+    <a href="https://basilisk-browser.org">Basilisk Development Team</a> under the Mozilla
+    Public Licence 2.0 (MPL). <a href="about:rights">Know your rights</a>/</p>
+    <br>
+    Basilisk was formerly developed by the <a href="http://www.palemoon.org/">Pale Moon project team</a>
+    and <a href="http://www.moonchildproductions.info/">Moonchild Productions</a>. Without them this project
+    would not exist.
diff --git a/basilisk/branding/official/LICENSE b/basilisk/branding/official/LICENSE
index 8833fe2..f1c6ade 100644
--- a/basilisk/branding/official/LICENSE
+++ b/basilisk/branding/official/LICENSE
@@ -1,10 +1,10 @@
 This location contains official branding for the Basilisk browser.
 
 Please note that you are not granted any trademark rights or licenses
-to the trademarks of Moonchild Productions or any other party,
+to the trademarks of Moonchild Productions, Basilisk-Dev, or any other party,
 including without limitation the Basilisk name or logo.
 
-These branding materials are Copyrighted (c) M. Straver. All rights reserved.
+These branding materials are Copyrighted (c) Basilisk-Dev. All rights reserved.
 
 Official branding using these files is only allowed by the copyright holder
-or by third parties with express permission from the copyright holder.
\ No newline at end of file
+or by third parties with express permission from the copyright holder.
diff --git a/basilisk/branding/official/locales/en-US/brand.dtd b/basilisk/branding/official/locales/en-US/brand.dtd
index 1d2ac79..68abf6d 100644
--- a/basilisk/branding/official/locales/en-US/brand.dtd
+++ b/basilisk/branding/official/locales/en-US/brand.dtd
@@ -7,4 +7,4 @@
 <!ENTITY  brandFullName         "Basilisk">
 <!ENTITY  vendorShortName       "Moonchild">
 <!ENTITY  vendorFullName        "Moonchild Productions">
-<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Moonchild Productions.">
+<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Basilisk-Dev.">
diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in
index d031911..9f47f42 100644
--- a/basilisk/installer/windows/nsis/defines.nsi.in
+++ b/basilisk/installer/windows/nsis/defines.nsi.in
@@ -51,7 +51,7 @@ VIProductVersion "1.0.0.0"
 VIAddVersionKey "ProductName"     "${BrandShortName}"
 VIAddVersionKey "CompanyName"     "${CompanyName}"
 #ifdef MOZ_OFFICIAL_BRANDING
-VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions."
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Basilisk-Dev."
 #endif
 VIAddVersionKey "LegalCopyright"  "${CompanyName}"
 VIAddVersionKey "FileVersion"     "${AppVersion}"