CONTRIBUTING: update licensing section

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3e8bb88e5a2c1cb44b175ea47866d780bd47224f..65ce8dc544ffe9c064683ca90ba7ac59cd4116ce 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,13 +7,15 @@ Please let us know your GitLab username [on Matrix](https://xonotic.org/chat) so
 
 # Licensing
 
-A condition for write (push) access and submission of merge requests is that **you agree that any code or data you push will be licensed under the [GNU General Public License, version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html), or any later version.**
+A condition for write (push) access and submission of merge requests is that **you agree that any code or other data you push will be licensed under the [GNU General Public License, version 3](https://www.gnu.org/licenses/gpl-3.0.html), or any later version.**
 
-If the directory or repository your changes apply to contains a LICENSE or COPYING file indicating another license or a dual license, then **you agree that your pushed code will be licensed as specified in that file.**  Examples of subdirectories and repositories with a dual license or a different license:
-* [xonotic-data.pk3dir/qcsrc/lib/warpzone](https://gitlab.com/xonotic/xonotic-data.pk3dir/-/tree/master/qcsrc/lib/warpzone) - dual licensed with GNU GPLv2 (or any later version), or MIT license.
+**Exceptions:** if the directory or repository your changes apply to contains a LICENSE or COPYING file indicating another license or a dual license, then **you agree that your pushed code or other data will be licensed as specified in that file.**  Examples of subdirectories and repositories with a dual license or a different license:
+* [xonotic-data.pk3dir/qcsrc/lib/warpzone](https://gitlab.com/xonotic/xonotic-data.pk3dir/-/tree/master/qcsrc/lib/warpzone) - dual-licensed with GNU GPLv2 (or any later version), or MIT license.
 * [xonstat-go](https://gitlab.com/xonotic/xonstat-go/) - licensed with [GNU AGPLv3](https://www.gnu.org/licenses/agpl-3.0.html)
 
-In case the code you pushed was not written by you, it is your responsibility to ensure proper licensing.
+In case the code or other data you pushed was not created by you, it is your responsibility to ensure proper licensing.
+
+See also the primary licensing document [COPYING](COPYING)
 
 
 # Technical

diff --git a/README.md b/README.md
index fa6dd7430861ac6065f78a85701f2dce328882a7..aafa1653dfc82ec0db38c7cd2bd3c85db8462385 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Xonotic is an addictive, arena-style first person shooter with crisp movement an
 
 ## License
 
-Xonotic is and will always be free and open source. It is available under the [copyleft](https://www.gnu.org/copyleft/)-style [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) license (see the [COPYING](COPYING) file for details).
+Xonotic is and will always be free and open source. It is available under the [copyleft](https://www.gnu.org/copyleft/)-style [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) license (see the [COPYING](COPYING) and [CONTRIBUTING](CONTRIBUTING.md#licensing) files for full details).
 
 ## Download