8000 minor #9767 Improved the Symfony License pages (javiereguiluz) · symfony/symfony-docs@350ab22 · GitHub
[go: up one dir, main page]
Skip to content

Commit 350ab22

Browse files
javiereguiluzjaviereguiluz
committed
minor #9767 Improved the Symfony License pages (javiereguiluz)
This PR was squashed before being merged into the 2.7 branch (closes #9767). Discussion ---------- Improved the Symfony License pages We need to be more precise because "Symfony License" !== "Symfony Code License". When you Google for Symfony License, the first result should be the actual second result: ![symfony-license-google](https://user-images.githubusercontent.com/73419/39986945-88dbb5aa-5763-11e8-9791-3289cf6ef040.png) Commits ------- acc3909 Improved the Symfony License pages
2 parents 3f120ad + acc3909 commit 350ab22

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

‎contributing/code/license.rst

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
.. _symfony2-license:
22

3-
Symfony License
4-
===============
3+
Symfony Code License
4+
====================
55

6-
Symfony is released under the MIT license.
7-
8-
According to `Wikipedia`_:
9-
10-
"It is a permissive license, meaning that it permits reuse within
11-
proprietary software on the condition that the license is distributed with
12-
that software. The license is also GPL-compatible, meaning that the GPL
13-
permits combination and redistribution with software that uses the MIT
14-
License."
15-
16-
The License
17-
-----------
6+
Symfony code is released under `the MIT license`_:
187

198
Copyright (c) 2004-2018 Fabien Potencier
209

@@ -36,4 +25,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3625
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
3726
THE SOFTWARE.
3827

39-
.. _Wikipedia: https://en.wikipedia.org/wiki/MIT_License
28+
Other Symfony Licenses
29+
----------------------
30+
31+
Check out the :doc:`license of the Symfony documentation </contributing/documentation/license>`
32+
and other `Symfony licenses and trademarks`_.
33+
34+
.. _`the MIT license`: https://en.wikipedia.org/wiki/MIT_License
35+
.. _`Symfony licenses and trademarks`: https://symfony.com/license

‎contributing/documentation/license.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,12 @@ Attribution-Share Alike 3.0 Unported License (`CC BY-SA 3.0`_).
4848

4949
This is a human-readable summary of the `Legal Code (the full license)`_.
5050

51+
Other Symfony Licenses
52+
----------------------
53+
54+
Check out the :doc:`license of the Symfony code </contributing/code/license>`
55+
and other `Symfony licenses and trademarks`_.
56+
5157
.. _`CC BY-SA 3.0`: http://creativecommons.org/licenses/by-sa/3.0/
5258
.. _Legal Code (the full license): http://creativecommons.org/licenses/by-sa/3.0/legalcode
59+
.. _`Symfony licenses and trademarks`: https://symfony.com/license

0 commit comments

Comments
 (0)
0