Merge branch '4.0' into 4.1

* 4.0:
  Fix a "duplicated reference" issue
  server_version should always be a string
  Document missing property_info node in framework configuration
  Remove typo in example constructor
  make the care team list actually in alphabetic order
  Add missing colon to reserved chars

Author: javiereguiluz

components/cache/cache_items.rst

@@ -17,7 +17,7 @@ The **key** of a cache item is a plain string which acts as its
 identifier, so it must be unique for each cache pool. You can freely choose the
 keys, but they should only contain letters (A-Z, a-z), numbers (0-9) and the
 ``_`` and ``.`` symbols. Other common symbols (such as ``{``, ``}``, ``(``,
-``)``, ``/``, ``\`` and ``@``) are reserved by the PSR-6 standard for future
+``)``, ``/``, ``\``, ``@`` and ``:``) are reserved by the PSR-6 standard for future
 uses.
 
 The **value** of a cache item can be any data represented by a type which is

contributing/code_of_conduct/care_team.rst

@@ -27,18 +27,18 @@ also contact all of them at once by emailing **coc@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>`_
 
+* **Tobias Nyholm**
+
+  * *E-mail*: tobias.nyholm [at] gmail.com
+  * *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
+  * *SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
+
 About the CARE Team
 -------------------
 

reference/configuration/doctrine.rst

@@ -142,13 +142,13 @@ If you want to configure multiple connections in YAML, put them under the
                     user:             root
                     password:         null
                     host:             localhost
-                    server_version:   5.6
+                    server_version:   '5.6'
                 customer:
                     dbname:           customer
                     user:             root
                     password:         null
                     host:             localhost
-                    server_version:   5.7
+                    server_version:   '5.7'
 
 The ``database_connection`` service always refers to the *default* connection,
 which is the first one defined or the one configured via the

reference/configuration/framework.rst

@@ -106,6 +106,10 @@ Configuration
   * `magic_call`_
   * `throw_exception_on_invalid_index`_
 
+* `property_info`_
+
+  * :ref:`enabled <reference-property-info-enabled>`
+
 * `request`_:
 
   * `formats`_
@@ -1576,6 +1580,16 @@ throw_exception_on_invalid_index
 When enabled, the ``property_accessor`` service throws an exception when you
 try to access an invalid index of an array.
 
+property_info
+~~~~~~~~~~~~~
+
+.. _reference-property-info-enabled:
+
+enabled
+.......
+
+**type**: ``boolean`` **default**: ``false``
+
 validation
 ~~~~~~~~~~
 

workflow/state-machines.rst

@@ -201,7 +201,7 @@ you can get this state machine by injecting the Workflow registry service::
     {
         private $workflows;
 
-        public function __constructor(Registry $workflows)
+        public function __construct(Registry $workflows)
         {
             $this->workflows = $workflows;
         }