diff --git a/legal.md b/LEGAL.md similarity index 74% rename from legal.md rename to LEGAL.md index 00220937c1d..2b83e59ab9d 100644 --- a/legal.md +++ b/LEGAL.md @@ -19,7 +19,10 @@ Note: We may make changes in within files that are licensed under MIT. These mod --- -Human-readable source code materials in this repository contributed **after** 17 February, 2024 at 23:00:00 UTC are licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`. +Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 may be licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`. +Note: If a file does not explicitly relicense itself as AGPLv3, it is to be assumed that it is still under MIT. + +Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`. ## Warranty diff --git a/MARKERS.md b/MARKERS.md new file mode 100644 index 00000000000..524fba8fba5 --- /dev/null +++ b/MARKERS.md @@ -0,0 +1,45 @@ +# A quick summary of how to mark code files in this repository + +## CSharp + +All C# code contributed after 17 February, 2024 23:00:00 UTC should contain the following header: + +```csharp +/* + * Delta-V - This file is licensed under AGPLv3 + * Copyright (c) [Year] Delta-V Contributors + * See AGPLv3.txt for details. + */ +``` + +For any changes within MIT licensed(upstream) files, the following marker should be used at the start of the modification + +```csharp +/* DeltaV - [Title of changes] - [Description of changes] +This code is licensed under AGPLv3. See LICENSE */ +yourCodeHere(); +// End of modified code +``` + +## Yaml + +All Yaml files contributed after 17 February, 2024 23:00:00 UTC should contain the following header: + +```yaml +# Delta-V - This file is licensed under AGPLv3 +# Copyright (c) [Year] Delta-V Contributors +# See AGPLv3.txt for details. +``` + +For any changes within MIT licensed(upstream) files, the following marker should be used at the start of the modification + +```yaml +# DeltaV - [Title of changes] - [Description of changes] +# This code is licensed under AGPLv3. See LICENSE +modifiedYaml: "Goes Here" +# End of modified code +``` + +## Note + +Both Space Wizards and Nyanotrasen code is licensed under MIT, and any changes made to their code should be marked as AGPLv3 with the above markers.