Merge branch '3.4' into 4.0

javiereguiluz · javiereguiluz · commit f30b44ecad3e · 2018-05-15T10:14:13.000+02:00
* 3.4:
  added the initial members of the CARE team
  Update event_dispatcher.rst
  Improved the Symfony License pages
  Updated from `new MyFormType()` to `MyFormType::class`
  Creating Messages link seems to be broken
diff --git 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,11 @@ 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 :doc:`license of the Symfony documentation </contributing/documentation/license>`
+and other `Symfony licenses and trademarks`_.
+
+.. _`the MIT license`: https://en.wikipedia.org/wiki/MIT_License
+.. _`Symfony licenses and trademarks`: https://symfony.com/license
diff --git a/contributing/code_of_conduct/care_team.rst b/contributing/code_of_conduct/care_team.rst
@@ -17,9 +17,27 @@ the CARE team or if you prefer contact only individual members of the CARE team.
 Members
 -------
 
-Here are all the members of the Code of Conduct CARE team. You can contact
-any of them directly using the contact details below or you can also contact all of
-them at once by emailing **coc@symfony.com**.
+Here are all the members of the Code of Conduct CARE team (in alphabetic order).
+You can contact any of them directly using the contact details below or you can
+also contact all of them at once by emailing **coc@symfony.com**:
+
+* **Emilie Lorenzo**
+
+  * *E-mail*: emilie.lorenzo [at] symfony.com
+  * *Twitter*: `@EmilieLorenzo <https://twitter.com/EmilieLorenzo>`_
+  * *SensioConnect*: `emilielorenzo <https://connect.sensiolabs.com/profile/emilielorenzo>`_
+
+* **Tobias Nyholm**
+
+  *E-mail*: tobias.nyholm [at] gmail.com
+  *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
+  *SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
+
+* **Michelle Sanver**
+
+  * *E-mail*: hello [at] michellesanver.com
+  * *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
+  * *SensioConnect*: `michellesanver <https://connect.sensiolabs.com/profile/michellesanver>`_
 
 About the CARE Team
 -------------------
diff --git a/contributing/documentation/license.rst b/contributing/documentation/license.rst
@@ -48,5 +48,12 @@ 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 :doc:`license of the Symfony code </contributing/code/license>`
+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
+.. _`Symfony licenses and trademarks`: https://symfony.com/license
diff --git a/email.rst b/email.rst
@@ -161,7 +161,7 @@ Learn more
 
 .. _`Swift Mailer`: http://swiftmailer.org/
 .. _`SwiftMailerBundle`: https://github.com/symfony/swiftmailer-bundle
-.. _`Creating Messages`: http://swiftmailer.org/docs/messages.html
+.. _`Creating Messages`: https://swiftmailer.symfony.com/docs/messages.html
 .. _`Mandrill`: https://mandrill.com/
 .. _`SendGrid`: https://sendgrid.com/
 .. _`Amazon SES`: http://aws.amazon.com/ses/
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
@@ -115,8 +115,8 @@ using a special "tag":
     method executed by default is ``onKernelException()``.
 
     The other optional tag attribute is called  ``priority``, which defaults to
-    ``0`` and it controls the order in which listeners are executed (the highest
-    the priority, the earlier a listener is executed). This is useful when you
+    ``0`` and it controls the order in which listeners are executed (the higher
+    the priority the earlier a listener is executed). This is useful when you
     need to guarantee that one listener is executed before another. The priorities
     of the internal Symfony listeners usually range from ``-255`` to ``255`` but
     your own listeners can use any positive or negative integer.
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -343,13 +343,13 @@ type::
 entry_type
 ~~~~~~~~~~
 
-**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **default**: Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType
+**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **default**: ``Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType``
 
 This is the field type for each item in this collection (e.g. ``TextType``,
 ``ChoiceType``, etc). For example, if you have an array of email addresses,
 you'd use the :doc:`EmailType </reference/forms/types/email>`. If you want
-to embed a collection of some other form, create a new instance of your
-form type and pass it as this option.
+to embed a collection of some other form, pass the form type class as this
+option (e.g. ``MyFormType::class``).
 
 prototype
 ~~~~~~~~~
