Merge branch '6.1' into 6.2

* 6.1:
  Fix "WordPress" spelling typo
  Minor tweak
  [Framework] clearified base_uri behavior with extra examples
  Minor tweak
  Update property_info.rst
  Adding more info about chain provider

Author: javiereguiluz

components/property_info.rst

@@ -323,13 +323,13 @@ this returns ``true`` if:
   ``@var SomeClass<DateTime>``, ``@var SomeClass<integer,string>``,
   ``@var Doctrine\Common\Collections\Collection<App\Entity\SomeEntity>``, etc.)
 
-``Type::getCollectionKeyType()`` & ``Type::getCollectionValueType()``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``Type::getCollectionKeyTypes()`` & ``Type::getCollectionValueTypes()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If the property is a collection, additional type objects may be returned
 for both the key and value types of the collection (if the information is
-available), via the :method:`Type::getCollectionKeyType() <Symfony\\Component\\PropertyInfo\\Type::getCollectionKeyType>`
-and :method:`Type::getCollectionValueType() <Symfony\\Component\\PropertyInfo\\Type::getCollectionValueType>`
+available), via the :method:`Type::getCollectionKeyTypes() <Symfony\\Component\\PropertyInfo\\Type::getCollectionKeyTypes>`
+and :method:`Type::getCollectionValueTypes() <Symfony\\Component\\PropertyInfo\\Type::getCollectionValueTypes>`
 methods.
 
 .. _`components-property-info-extractors`:

create_framework/event_dispatcher.rst

@@ -8,7 +8,7 @@ hook into the framework life cycle to modify the way the request is handled.
 What kind of hooks are we talking about? Authentication or caching for
 instance. To be flexible, hooks must be plug-and-play; the ones you "register"
 for an application are different from the next one depending on your specific
-needs. Many software have a similar concept like Drupal or Wordpress. In some
+needs. Many software have a similar concept like Drupal or WordPress. In some
 languages, there is even a standard like `WSGI`_ in Python or `Rack`_ in Ruby.
 
 As there is no standard for PHP, we are going to use a well-known design

reference/configuration/framework.rst

@@ -953,16 +953,21 @@ every request.
 
 Here are some common examples of how ``base_uri`` merging works in practice:
 
-=======================  ==================  ==========================
-``base_uri``             Relative URI        Actual Requested URI
-=======================  ==================  ==========================
-http://example.org       /bar                http://example.org/bar
-http://example.org/foo   /bar                http://example.org/bar
-http://example.org/foo   bar                 http://example.org/bar
-http://example.org/foo/  bar                 http://example.org/foo/bar
-http://example.org       http://symfony.com  http://symfony.com
-http://example.org/?bar  bar                 http://example.org/bar
-=======================  ==================  ==========================
+==========================  ==================  =============================
+``base_uri``                Relative URI        Actual Requested URI
+==========================  ==================  =============================
+http://example.org          /bar                http://example.org/bar
+http://example.org/foo      /bar                http://example.org/bar
+http://example.org/foo      bar                 http://example.org/bar
+http://example.org/foo/     /bar                http://example.org/bar
+http://example.org/foo/     bar                 http://example.org/foo/bar
+http://example.org          http://symfony.com  http://symfony.com
+http://example.org/?bar     bar                 http://example.org/bar
+http://example.org/api/v4   /bar                http://example.org/bar
+http://example.org/api/v4/  /bar                http://example.org/bar
+http://example.org/api/v4   bar                 http://example.org/api/bar
+http://example.org/api/v4/  bar                 http://example.org/api/v4/bar
+==========================  ==================  =============================
 
 bindto
 ......

security.rst

@@ -317,6 +317,8 @@ Symfony comes with several built-in user providers:
     Loads users from a configuration file;
 :ref:`Chain User Provider <security-chain-user-provider>`
     Merges two or more user providers into a new user provider.
+    Since each firewall has exactly *one* user provider, you can use this
+    to chain multiple providers together.
 
 The built-in user providers cover the most common needs for applications, but you
 can also create your own :ref:`custom user provider <security-custom-user-provider>`.