Readme, license, and CLA clarifications

Author: Topaz

CONTRIBUTOR_AGREEMENT.md

@@ -1,29 +1,28 @@
 # Project Topaz Limited Contributor License Agreement
-(Updated December 10, 2019)
+(Updated December 20, 2019)
 
 **By submitting a Pull Request to Project Topaz ("Us", "We", "Our"), You represent, warrant, and agree:**
 * **1. Representations and Warranties; Indemnification**
   * You have the legal authority to enter into this Agreement
   * You own the Copyright and patent claims covering Your Contribution, and that such claims may not also be claimed by third parties, including Your school or employer
   * The rights You grant Us do not violate any grant of right You have made to third parties, or any other rights owned by third parties
-  * Your Contribution can be legally licensed under the AGPLv3 or later version
+  * Your Contribution can be legally licensed under either the GPLv3, the AGPLv3, or their later versions
   * You shall, at Our request, indemnify, defend, and hold harmless Project Topaz, its affiliates, and its officers from and against any and all claims, losses, liabilities, damages, expenses and costs (including reasonable attorneys' fees), arising from your breach, or alleged breach, of this Section 1.
 * **2. Contribution License**
-* Your Contribution - regardless of the license of any code upon which the Contribution is based - is to be licensed under the Project Topaz License, which licenses Our material under the terms of the AGPLv3 with additional supplemental terms
 * You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license to, at any time, and without notice to You:
-  * Add to, modify, or remove from the Contribution any Additional Permissions under Section 7, Additional Terms of the AGPLv3 license, provided:
+  * License or relicense, and then convey, the Contribution under any version of the GPL or AGPL
+  * Add to, modify, or remove from the Contribution any Additional Permissions under Section 7, Additional Terms of either the GPLv3 or AGPLv3 licenses, provided:
     * The Additional Permission is or was a reasonable attempt to increase user modification, server customization, or project adoption; or 
     * The Additional Permission is or was a reasonable attempt to restrict the requirements of Section 13, Remote Network Interaction of the AGPLv3, from applying to a modification or Program which falls outside the current scope of Project Topaz; and
     * The Additional Permission would not violate the terms of a hypothetical _GPLv3_ license (_not_ AGPLv3) which _lacks_ Additional Permissions
-  * Add to, modify, or remove from the Contribution any supplemental restrictions which are allowed under Section 7, Additional Terms of the AGPLv3
-  * License, relicense, or sublicense, and then convey, the Contribution under any version of the GPL or AGPL
-  * License, relicense, or sublicense, and then convey, the Contribution under any version of the Project Topaz License, provided:
-  	* That version of the Project Topaz License does not violate the terms of a GPLv3 license (_with_ any supplemental restriction allowed under Section 7, Additional Terms); and
+  * Add to, modify, or remove from the Contribution any supplemental _non-permissive_ terms which are allowed under Section 7, Additional Terms of either the GPLv3 or AGPLv3
+  * License or relicense, and then convey, the Contribution under any version of the Project Topaz License, provided:
+  	* That version of the Project Topaz License does not violate the terms of a GPLv3 license (_with_ any supplemental non-permissive terms allowed under Section 7, Additional Terms); and
   	* In the event that version of the Project Topaz License would violate a term of the GPLv3 license, the rest of the Project Topaz License will remain in the full effect allowed by the GPLv3
-  * Grant to third parties, at Our sole discretion, a limited sublicense exempting them from being bound by any requirement of Section 13, Remote Network Interaction of the AGPLv3, if at the time the sublicense is granted:
+  * Grant to third parties, at Our sole discretion, a limited license applying to Your Contribution which exempts them from being bound by any requirement of Section 13, Remote Network Interaction of the AGPLv3, if at the time the license is granted:
     * Their modification would be in violation of the Additional Permissions enumerated in the current version of the Project Topaz License; 
     * Their modification can not be reasonably achieved with the methods the Program provides or intends for modification, without violating the Additional Permissions of that Project Topaz License; and
-    * The sublicense expires when the modification can be reasonably achieved with methods the Program later provides or intends for modification, while fully abiding by the Project Topaz License
+    * The license expires when the modification can be reasonably achieved with methods the Program later provides or intends for modification, while fully abiding by the Project Topaz License
 * All references to both the GNU General Public License and the GNU Affero Public License may, at Our sole option, and without notice to You: 
 	* Be updated to any later version of those licenses, and we may relicense Your Contribution under those later versions
 	* Any restrictions placed on the terms for which We may license Your Contribution may be updated to reference those later versions
@@ -34,7 +33,7 @@
 * **4. Contribution Ownership**
   * You continue to retain all ownership rights to Your contribution, including any and all Copyright and patent claims.
   * Any and all rights You grant to Project Topaz are not exclusive, and You may grant them to other third parties.
-  * In the event that You transfer your ownership rights to any third party, Project Topaz will retain the rights You have granted us.
+  * In the event that You transfer Your ownership rights to any third party, Project Topaz will retain the rights You have granted us.
 * **5. General**
   * **Nothing in this Agreement shall be construed to allow Us to convey your Contribution in any fashion which would violate the terms of a GPLv3 license** (_not_ AGPLv3) which lacks Additional Permissions. For example, We may not, even with this license You are granting to Us, convey your Contribution without the underlying source code, or remove the copyleft nature of the GPLv3 from Your Contribution.
   * **All Contributions currently in the Project Topaz repository for which You own the Copyright and patent claims to will be subject to this Agreement**, as written at the time of your most recent Contribution to Us, regardless of when the Contributions were added to the repository. 

LICENSE

@@ -1,5 +1,5 @@
                           PROJECT TOPAZ LICENSE
-                       Version 1, 01 December 2019
+                       Version 1, 20 December 2019
 
  Copyright (C) 2019 Project Topaz.
 
@@ -47,11 +47,11 @@ entire server source code were available to public view.
 source code that we have have combined from Darkstar Project which is 
 licensed under GPLv3 (that we can not relicense as AGPLv3), Project 
 Topaz releases its source code under this special license. This license 
-states the requirements of these two GNU licenses, GPLv3 and AGPLv3, 
-in how they pertain to parts of this combined source code. The license 
-also grants, for source code which is the work of Project Topaz, select 
-Additional Permissions to give server operators additional freedoms, 
-and to encourage adoption of the project.
+states which of the two GNU licenses, GPLv3 or AGPLv3, pertain to
+which parts of this combined source code. The license also grants, for 
+source code which is the work of Project Topaz, select Additional 
+Permissions to give server operators additional freedoms, and to 
+encourage adoption of the project.
 
   The precise terms and conditions for using, copying, distribution and
 modification of Project Topaz follow.
@@ -142,10 +142,6 @@ without cloning, or were given it by a third party, and the archive
 you received lacks this Git information, you can and are encouraged 
 to view this information on our GitHub repository.
 
-  We distinguish which parts of Project Topaz's source code are 
-governed by the GPLv3, and which are governed by the AGPLv3, based on 
-the author and the origin of the commit.
-
   2. Basic License Terms.
 
   Project Topaz is a combined work of source code licensed under
@@ -155,45 +151,45 @@ Terms are defined later in this license document.
 
   All Git commits which originate from Darkstar Project, either 
 before or after Project Topaz's initial repository commit on 
-GitHub, are governed by the GPLv3, unless the owner of the copyright 
-for the source code has agreed to our Limited Contributor License 
-Agreement. This Agreement can be found either included with this 
-source code in the CONTRIBUTOR_AGREEMENT file, or available 
-online in our GitHub repository.
-
-  As per the terms of our Limited Contributor License Agreement, 
-source code contributions by authors who have agreed to the 
-agreement are instead licensed under this Project Topaz License, 
-which licenses to you the right to use, modify, and convey all 
-such material under the AGPLv3 supplemented with Additional 
-Terms defined later in this license document.
-
-  A list of developers who have agreed to our Limited Contributor
-License Agreement can be found either on our GitHub repository's 
-wiki, or in the AUTHORS file, included with this source code or 
-available online in our GitHub repository.
-
-  Modifications you make to the source code are governed by the 
-license which the original work was licensed under. However, per 
-Section 13 of both the GPLv3 and the AGPLv3, all modifications 
-you make to this Program, or works you combine with this 
-Program, are subject to the requirements of the AGPLv3 concerning 
-interaction through a network.
+GitHub, are governed by the GPLv3. 
+
+  Source code files which are marked as being licensed under 
+the GPLv3 are as marked. There may be additional terms which apply 
+to these files. These will be declared in the license header at 
+the top of the file.
+
+  Additionally, any source code files which are not clearly marked 
+as being governed by the AGPLv3 may be assumed to be governed 
+by the GPLv3.
+
+  Portions of Project Topaz which are governed by the AGPLv3 will 
+be clearly marked at the top of all relevant source code files. 
+When such declared, there are additional terms applied to these 
+source files which supplement the AGPLv3. These additional terms 
+are defined later in this license document.
+
+  Your rights to use, modify, and distribute source code are governed 
+by the license which the original work was licensed under. However, 
+per Section 13 of both the GPLv3 and the AGPLv3, all modifications 
+you make to this Program, or works you combine with this Program, 
+are subject to the requirements of the AGPLv3 concerning interaction 
+through a network.
 
   3. Additional Terms.
 
   Through Section 7, Additional Terms of the AGPLv3, we are adding
 the following additional terms to our material:
 
     a) ADDITIONAL PERMISSIONS.
-	Project Topaz grants you an additional permission 
-	exempting you from being bound by Section 13 Remote Network
-	Interaction of the AGPLv3, for modifications you make to the
-	Program, if the modification is:
-
-      i. Necessary for the basic operation of the server. Examples 
-	  include basic server configuration, network connection 
-	  configuration, and database access information; or
+	For all of our material which is governed by the AGPLv3, 
+	Project Topaz grants you an additional permission exempting 
+	you from being bound by Section 13 Remote Network Interaction 
+	of the AGPLv3, for modifications you make to the Program, if 
+	the modification is:
+
+      i. Necessary for the basic operation of a private server. 
+	  Examples include basic server configuration, network 
+	  connection configuration, and database access information; or
 
 	  ii. A non-retail modification, which can not reasonably be
 	  considered a modification with the purpose of improving server 

README.md

@@ -1,7 +1,9 @@
 Project Topaz
 ========
 
-**If you're switching to Project Topaz from Darkstar Project, we have a differing license agreement, which may require your server source code to be made available to users. See the [Project Topaz License](https://github.com/project-topaz/topaz/blob/master/LICENSE), and the [GNU AGPLv3](https://github.com/project-topaz/topaz/blob/master/AGPL3) (Section 13).**
+**If you're switching to Project Topaz from Darkstar Project, portions of our project may be governed by the [GNU AGPLv3](https://github.com/project-topaz/topaz/blob/master/AGPL3) instead of the [GNU GPLv3](https://github.com/project-topaz/topaz/blob/master/GPL3). This may require your server source code to be made available to users.**
+
+**Any such portions will be clearly marked as being governed by the AGPLv3 in all relevant source files. Any source code not so marked is instead governed by the GPLv3, and may be used or modified without offering source to connecting users, provided it is not combined with any AGPLv3 source code. See Section 13 of both the GPLv3 and AGPLv3 for more information, and the [Project Topaz License](https://github.com/project-topaz/topaz/blob/master/LICENSE) for [additional permissions](https://github.com/project-topaz/topaz/blob/master/LICENSE#L182) which may exempt you from this requirement.**
 
 Welcome to Project Topaz, an emulation server for FFXI.
 Visit our Discord to keep in touch with the latest developments.