From b1ca842055edfe9e3254a9de3b58e8472d1bd313 Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:06:06 -0700 Subject: [PATCH 1/7] Fixed the grammar (missing "is") in last sentence of last paragraph on the "Best Practices for Engine Contributors" page. --- .../development/best_practices_for_engine_contributors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/development/best_practices_for_engine_contributors.rst b/contributing/development/best_practices_for_engine_contributors.rst index 48f730dad48..ee00842fc1b 100644 --- a/contributing/development/best_practices_for_engine_contributors.rst +++ b/contributing/development/best_practices_for_engine_contributors.rst @@ -236,5 +236,5 @@ In particular, we cannot accept libraries licensed under the GPL or LGPL since these licenses effectively disallow static linking in proprietary software (which Godot is distributed as in most exported projects). This requirement also applies to the editor, since we may want to run it on iOS in the long term. -Since iOS doesn't support dynamic linking, static linking the only option on +Since iOS doesn't support dynamic linking, static linking is the only option on that platform. From 135b6891d5d6f15712c29ee8a38e0a00179c2668 Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:44:04 -0700 Subject: [PATCH 2/7] Removed extra verbiage in last two paragraphs of "best practices for contributors" section --- .../development/best_practices_for_engine_contributors.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contributing/development/best_practices_for_engine_contributors.rst b/contributing/development/best_practices_for_engine_contributors.rst index ee00842fc1b..a91a3b36e0a 100644 --- a/contributing/development/best_practices_for_engine_contributors.rst +++ b/contributing/development/best_practices_for_engine_contributors.rst @@ -227,10 +227,10 @@ link libraries dynamically. Instead, we bundle them in our source tree. .. image:: img/best_practices8.png As a result, we are very picky with what goes in, and we tend to prefer smaller -libraries (in fact, single header ones are our favorite). Only in cases where -there is no other choice we end up bundling something larger. +libraries (single header ones are our favorite). We will only bundle something +larger if there is no other choice. -Also, libraries must use a permissive enough license to be included into Godot. +Libraries must use a permissive enough license to be included into Godot. Some examples of acceptable licenses are Apache 2.0, BSD, MIT, ISC, and MPL 2.0. In particular, we cannot accept libraries licensed under the GPL or LGPL since these licenses effectively disallow static linking in proprietary software From 63a6dd477142823e0ab068a8e9c752071cf7b434 Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Wed, 7 Jun 2023 20:00:32 -0700 Subject: [PATCH 3/7] Add a note near top of "Complying with Licenses" tab pointing to "Best Practices for Engine Contributors" to help redirect people interested in license contribution from a contributor perspective. --- about/complying_with_licenses.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/about/complying_with_licenses.rst b/about/complying_with_licenses.rst index af180d82d89..7265965dca8 100644 --- a/about/complying_with_licenses.rst +++ b/about/complying_with_licenses.rst @@ -16,6 +16,13 @@ distribute the software (and derivative projects, including games made with it). Your game or project can have a different license, but it still needs to comply with the original one. +.. note:: + + This section covers compliance with licenses from a user perspective. + If you are interested in licence complience as a contributor, please see + the last two paragraphs of the "Best Practices for Engine Contributors", + found in the "Engine Development" section, found under "Contributing". + .. warning:: In your project's credits screen, remember to also list third-party notices From afd7480718bf80193e556a833f6e04621826cca0 Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Wed, 7 Jun 2023 20:33:31 -0700 Subject: [PATCH 4/7] Added link to Contribution Best Practices from License Compliance Page --- about/complying_with_licenses.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/about/complying_with_licenses.rst b/about/complying_with_licenses.rst index 7265965dca8..ecd165ad904 100644 --- a/about/complying_with_licenses.rst +++ b/about/complying_with_licenses.rst @@ -20,8 +20,7 @@ with the original one. This section covers compliance with licenses from a user perspective. If you are interested in licence complience as a contributor, please see - the last two paragraphs of the "Best Practices for Engine Contributors", - found in the "Engine Development" section, found under "Contributing". + the last two paragraphs of :ref:`Best Practices for Engine Contributors ` .. warning:: From 07811bc89daa0bdaab72bd57a17b776e73fc637e Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Wed, 7 Jun 2023 20:51:10 -0700 Subject: [PATCH 5/7] Fixed spelling of "compliance" --- about/complying_with_licenses.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/complying_with_licenses.rst b/about/complying_with_licenses.rst index ecd165ad904..a5cf316b00c 100644 --- a/about/complying_with_licenses.rst +++ b/about/complying_with_licenses.rst @@ -19,7 +19,7 @@ with the original one. .. note:: This section covers compliance with licenses from a user perspective. - If you are interested in licence complience as a contributor, please see + If you are interested in licence compliance as a contributor, please see the last two paragraphs of :ref:`Best Practices for Engine Contributors ` .. warning:: From 8b2b243945714ae250bd4e239ad75b0ee0d00ca3 Mon Sep 17 00:00:00 2001 From: Matt Chalabian <70189609+mattchala@users.noreply.github.com> Date: Thu, 8 Jun 2023 22:45:59 -0700 Subject: [PATCH 6/7] Added new anchor to contributor license compliance paragraph in best practices section. Reworded Note in complying with licenses section. --- about/complying_with_licenses.rst | 4 ++-- .../development/best_practices_for_engine_contributors.rst | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/about/complying_with_licenses.rst b/about/complying_with_licenses.rst index a5cf316b00c..ae933c3e33a 100644 --- a/about/complying_with_licenses.rst +++ b/about/complying_with_licenses.rst @@ -19,8 +19,8 @@ with the original one. .. note:: This section covers compliance with licenses from a user perspective. - If you are interested in licence compliance as a contributor, please see - the last two paragraphs of :ref:`Best Practices for Engine Contributors ` + If you are interested in licence compliance as a contributor, you can find + guidelines :ref:`here. ` .. warning:: diff --git a/contributing/development/best_practices_for_engine_contributors.rst b/contributing/development/best_practices_for_engine_contributors.rst index a91a3b36e0a..87fdf14a000 100644 --- a/contributing/development/best_practices_for_engine_contributors.rst +++ b/contributing/development/best_practices_for_engine_contributors.rst @@ -230,6 +230,8 @@ As a result, we are very picky with what goes in, and we tend to prefer smaller libraries (single header ones are our favorite). We will only bundle something larger if there is no other choice. +.. _doc_best_practices_for_engine_contributors_license_compliance: + Libraries must use a permissive enough license to be included into Godot. Some examples of acceptable licenses are Apache 2.0, BSD, MIT, ISC, and MPL 2.0. In particular, we cannot accept libraries licensed under the GPL or LGPL since From bb259be5002015967263e17dcebe63f13374c70b Mon Sep 17 00:00:00 2001 From: Max Hilbrunner Date: Fri, 9 Jun 2023 17:48:52 +0200 Subject: [PATCH 7/7] Update about/complying_with_licenses.rst Co-authored-by: Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> --- about/complying_with_licenses.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/complying_with_licenses.rst b/about/complying_with_licenses.rst index ae933c3e33a..0a013277f66 100644 --- a/about/complying_with_licenses.rst +++ b/about/complying_with_licenses.rst @@ -20,7 +20,7 @@ with the original one. This section covers compliance with licenses from a user perspective. If you are interested in licence compliance as a contributor, you can find - guidelines :ref:`here. ` + guidelines :ref:`here `. .. warning::