From 72b30b2f3232245ae50409217accc62883406bbd Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 May 2018 10:41:36 +0200 Subject: [PATCH 1/3] Improved the Symfony License pages --- contributing/code/license.rst | 27 ++++++++++++-------------- contributing/documentation/license.rst | 8 ++++++++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/contributing/code/license.rst b/contributing/code/license.rst index 261e25324d3..736a6ddb94f 100644 --- a/contributing/code/license.rst +++ b/contributing/code/license.rst @@ -1,20 +1,9 @@ .. _symfony2-license: -Symfony License -=============== +Symfony Code License +==================== -Symfony is released under the MIT license. - -According to `Wikipedia`_: - - "It is a permissive license, meaning that it permits reuse within - proprietary software on the condition that the license is distributed with - that software. The license is also GPL-compatible, meaning that the GPL - permits combination and redistribution with software that uses the MIT - License." - -The License ------------ +Symfony code is released under `the MIT license`_: Copyright (c) 2004-2018 Fabien Potencier @@ -36,4 +25,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -.. _Wikipedia: https://en.wikipedia.org/wiki/MIT_License +Other Symfony Licenses +---------------------- + +Check out the `license of the Symfony documentation`_ and other +`Symfony licenses and trademarks`_. + +.. `the MIT license`: https://en.wikipedia.org/wiki/MIT_License +.. _`license of the Symfony documentation`: https://symfony.com/doc/current/contributing/documentation/license.html +.. _`Symfony licenses and trademarks`: https://symfony.com/license diff --git a/contributing/documentation/license.rst b/contributing/documentation/license.rst index d8a23b0efbe..8a1e5005321 100644 --- a/contributing/documentation/license.rst +++ b/contributing/documentation/license.rst @@ -48,5 +48,13 @@ Attribution-Share Alike 3.0 Unported License (`CC BY-SA 3.0`_). This is a human-readable summary of the `Legal Code (the full license)`_. +Other Symfony Licenses +---------------------- + +Check out the `license of the Symfony code`_ and other +`Symfony licenses and trademarks`_. + .. _`CC BY-SA 3.0`: http://creativecommons.org/licenses/by-sa/3.0/ .. _Legal Code (the full license): http://creativecommons.org/licenses/by-sa/3.0/legalcode +.. _`license of the Symfony code`: https://symfony.com/doc/current/contributing/code/license.html +.. _`Symfony licenses and trademarks`: https://symfony.com/license From 7fbd12f31a5473432b639ec0049f02326079f933 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 May 2018 11:29:41 +0200 Subject: [PATCH 2/3] Use internal links instead of absolute URLs --- contributing/code/license.rst | 5 ++--- contributing/documentation/license.rst | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/contributing/code/license.rst b/contributing/code/license.rst index 736a6ddb94f..5641275a006 100644 --- a/contributing/code/license.rst +++ b/contributing/code/license.rst @@ -28,9 +28,8 @@ THE SOFTWARE. Other Symfony Licenses ---------------------- -Check out the `license of the Symfony documentation`_ and other -`Symfony licenses and trademarks`_. +Check out the :doc:`license of the Symfony documentation ` +and other `Symfony licenses and trademarks`_. .. `the MIT license`: https://en.wikipedia.org/wiki/MIT_License -.. _`license of the Symfony documentation`: https://symfony.com/doc/current/contributing/documentation/license.html .. _`Symfony licenses and trademarks`: https://symfony.com/license diff --git a/contributing/documentation/license.rst b/contributing/documentation/license.rst index 8a1e5005321..d786da396cd 100644 --- a/contributing/documentation/license.rst +++ b/contributing/documentation/license.rst @@ -51,10 +51,9 @@ This is a human-readable summary of the `Legal Code (the full license)`_. Other Symfony Licenses ---------------------- -Check out the `license of the Symfony code`_ and other -`Symfony licenses and trademarks`_. +Check out the :doc:`license of the Symfony code ` +and other `Symfony licenses and trademarks`_. .. _`CC BY-SA 3.0`: http://creativecommons.org/licenses/by-sa/3.0/ .. _Legal Code (the full license): http://creativecommons.org/licenses/by-sa/3.0/legalcode -.. _`license of the Symfony code`: https://symfony.com/doc/current/contributing/code/license.html .. _`Symfony licenses and trademarks`: https://symfony.com/license From 35bb88fdf98a34c7ca56c07c455b8a2a68bff09f Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 May 2018 11:35:42 +0200 Subject: [PATCH 3/3] Fixed error --- contributing/code/license.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code/license.rst b/contributing/code/license.rst index 5641275a006..916fbd637f4 100644 --- a/contributing/code/license.rst +++ b/contributing/code/license.rst @@ -31,5 +31,5 @@ Other Symfony Licenses Check out the :doc:`license of the Symfony documentation ` and other `Symfony licenses and trademarks`_. -.. `the MIT license`: https://en.wikipedia.org/wiki/MIT_License +.. _`the MIT license`: https://en.wikipedia.org/wiki/MIT_License .. _`Symfony licenses and trademarks`: https://symfony.com/license