From 5466dc6189c23ace043f26232422b0ddedb8ee2a Mon Sep 17 00:00:00 2001 From: Michael Alexsander Silva Dias Date: Wed, 17 Apr 2019 11:16:04 -0300 Subject: [PATCH] General fixes for the new "Legal" page --- tutorials/legal/complying_with_licenses.rst | 39 ++++++++++----------- tutorials/legal/index.rst | 4 +-- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/tutorials/legal/complying_with_licenses.rst b/tutorials/legal/complying_with_licenses.rst index b39fb18db..1a0820b34 100644 --- a/tutorials/legal/complying_with_licenses.rst +++ b/tutorials/legal/complying_with_licenses.rst @@ -10,26 +10,25 @@ Godot is created and distributed under the `MIT License `_ to render fonts. It's license requires attribution, so the following text must be included together with the Godot license: -:: + Portions of this software are copyright © The FreeType Project (www.freetype.org). All rights reserved. ENet ^^^^ -If the project being creater is a multiplayer game using the `ENet `_ driver, ENet has similar licensing terms as Godot +If the project being creater is a multiplayer game using the `ENet `_ driver, ENet has similar licensing terms as Godot + -:: Copyright (c) 2002-2016 Lee Salzman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -95,7 +94,7 @@ MBedTLS If the is done with Godot 3.1 or above and it utilizes SSL (usually through HTTP requests), the `MBedTLS `_ Apache license needs to be complied by including the following text: -:: + MBedTLS is Copyright (C) 2013-2019 ARM Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -105,5 +104,3 @@ If the is done with Godot 3.1 or above and it utilizes SSL (usually through HTTP Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Keep in mind that Godot 2.x and 3.0 use `OpenSSL `_ instead. - - diff --git a/tutorials/legal/index.rst b/tutorials/legal/index.rst index 59d2f0a85..d142fc14b 100644 --- a/tutorials/legal/index.rst +++ b/tutorials/legal/index.rst @@ -1,5 +1,5 @@ -VR -== +Legal +===== .. toctree:: :maxdepth: 1