Skip to content

Commit 37026a0

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: added the initial members of the CARE team Update event_dispatcher.rst Improved the Symfony License pages Creating Messages link seems to be broken
2 parents fcb463d + 1b29af2 commit 37026a0

File tree

5 files changed

+42
-21
lines changed

5 files changed

+42
-21
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/code_of_conduct/care_team.rst

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,27 @@ the CARE team or if you prefer contact only individual members of the CARE team.
1717
Members
1818
-------
1919

20-
Here are all the members of the Code of Conduct CARE team. You can contact
21-
any of them directly using the contact details below or you can also contact all of
22-
them at once by emailing **[email protected]**.
20+
Here are all the members of the Code of Conduct CARE team (in alphabetic order).
21+
You can contact any of them directly using the contact details below or you can
22+
also contact all of them at once by emailing **[email protected]**:
23+
24+
* **Emilie Lorenzo**
25+
26+
* *E-mail*: emilie.lorenzo [at] symfony.com
27+
* *Twitter*: `@EmilieLorenzo <https://twitter.com/EmilieLorenzo>`_
28+
* *SensioConnect*: `emilielorenzo <https://connect.sensiolabs.com/profile/emilielorenzo>`_
29+
30+
* **Tobias Nyholm**
31+
32+
*E-mail*: tobias.nyholm [at] gmail.com
33+
*Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
34+
*SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
35+
36+
* **Michelle Sanver**
37+
38+
* *E-mail*: hello [at] michellesanver.com
39+
* *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
40+
* *SensioConnect*: `michellesanver <https://connect.sensiolabs.com/profile/michellesanver>`_
2341

2442
About the CARE Team
2543
-------------------

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

email.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Learn more
169169
email/*
170170

171171
.. _`Swift Mailer`: http://swiftmailer.org/
172-
.. _`Creating Messages`: http://swiftmailer.org/docs/messages.html
172+
.. _`Creating Messages`: https://swiftmailer.symfony.com/docs/messages.html
173173
.. _`Mandrill`: https://mandrill.com/
174174
.. _`SendGrid`: https://sendgrid.com/
175175
.. _`Amazon SES`: http://aws.amazon.com/ses/

event_dispatcher.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ using a special "tag":
118118
method executed by default is ``onKernelException()``.
119119

120120
The other optional tag attribute is called ``priority``, which defaults to
121-
``0`` and it controls the order in which listeners are executed (the highest
122-
the priority, the earlier a listener is executed). This is useful when you
121+
``0`` and it controls the order in which listeners are executed (the higher
122+
the priority the earlier a listener is executed). This is useful when you
123123
need to guarantee that one listener is executed before another. The priorities
124124
of the internal Symfony listeners usually range from ``-255`` to ``255`` but
125125
your own listeners can use any positive or negative integer.

0 commit comments

Comments
 (0)