From 5175fb8256c3af8304ae72828672612e05eb7cbf Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Tue, 13 Sep 2022 13:57:24 -0400 Subject: [PATCH] Use official CC BY 3.0 terminology and resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes the docs repo always use the official abbreviation (CC BY 3.0) for its license. Previously, it would sometimes use “CC-BY 3.0” or “CC-BY-3.0”. This change also make the docs repo always point to the official Commons deed [1] for more information about CC BY 3.0. Previously, it would sometimes link to an unofficial source [2]. [1]: [2]: --- AUTHORS.md | 2 +- about/faq.rst | 2 +- about/introduction.rst | 2 +- .../contributing/contributing_to_the_documentation.rst | 6 +++--- conf.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 71a5e0de1..8a87aeb6f 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ Godot Engine is developed by a community of voluntary contributors who contribute on all areas, including writing and maintaining the documentation. It is impossible to list them all; nevertheless, this file aims at listing -the writers who contributed significant patches to this CC-BY licensed +the writers who contributed significant patches to this CC BY licensed documentation on the `godot-docs` repository. GitHub usernames are indicated in parentheses, or as sole entry when no other diff --git a/about/faq.rst b/about/faq.rst index 962feae22..8af1544d5 100644 --- a/about/faq.rst +++ b/about/faq.rst @@ -17,7 +17,7 @@ In short: * You are free to modify, distribute, redistribute, and remix Godot to your heart's content, for any reason, both non-commercially and commercially. All the contents of this accompanying documentation are published under -the permissive Creative Commons Attribution 3.0 (`CC-BY 3.0 `_) license, with attribution +the permissive Creative Commons Attribution 3.0 (`CC BY 3.0 `_) license, with attribution to "Juan Linietsky, Ariel Manzur and the Godot Engine community." Logos and icons are generally under the same Creative Commons license. Note diff --git a/about/introduction.rst b/about/introduction.rst index 80956aa4b..f71925126 100644 --- a/about/introduction.rst +++ b/about/introduction.rst @@ -69,7 +69,7 @@ open source `Sphinx `_ and `ReadTheDocs `_. All the contents are under the permissive Creative Commons Attribution 3.0 -(`CC-BY 3.0 `_) license, with +(`CC BY 3.0 `_) license, with attribution to "Juan Linietsky, Ariel Manzur and the Godot Engine community". Organization of the documentation diff --git a/community/contributing/contributing_to_the_documentation.rst b/community/contributing/contributing_to_the_documentation.rst index 9158d698e..097e2b3dd 100644 --- a/community/contributing/contributing_to_the_documentation.rst +++ b/community/contributing/contributing_to_the_documentation.rst @@ -180,9 +180,9 @@ License ------- This documentation and every page it contains is published under the terms of -the `Creative Commons Attribution 3.0 license (CC-BY-3.0) -`_, with -attribution to "Juan Linietsky, Ariel Manzur and the Godot community". +the `Creative Commons Attribution 3.0 license (CC BY 3.0) +`_, with attribution to "Juan +Linietsky, Ariel Manzur and the Godot community". By contributing to the documentation on the GitHub repository, you agree that your changes are distributed under this license. diff --git a/conf.py b/conf.py index f5d325abf..e95c9f5c7 100644 --- a/conf.py +++ b/conf.py @@ -77,7 +77,7 @@ master_doc = "index" # General information about the project project = "Godot Engine" copyright = ( - "2014-2022, Juan Linietsky, Ariel Manzur and the Godot community (CC-BY 3.0)" + "2014-2022, Juan Linietsky, Ariel Manzur and the Godot community (CC BY 3.0)" ) author = "Juan Linietsky, Ariel Manzur and the Godot community"