Merge branch '5.1'

javiereguiluz · javiereguiluz · commit 49a48a5ac5d9 · 2020-09-09T20:13:35.000+02:00
* 5.1:
  explain precedence of translation directories
  [Mercure] update mercure doc to add clarification in authorization
  Update setup.rst
diff --git a/mercure.rst b/mercure.rst
@@ -364,9 +364,19 @@ a JWT containing a topic selector matching by the update's topic.
 
 To provide this JWT, the subscriber can use a cookie,
 or a ``Authorization`` HTTP header.
-Cookies are automatically sent by the browsers when opening an ``EventSource`` connection.
-Using cookies is the most secure and preferred way when the client is a web browser.
-If the client is not a web browser, then using an authorization header is the way to go.
+
+Cookies are automatically sent by the browsers when opening an ``EventSource``
+connection if the ``withCredentials`` attribute is set to ``true``:
+
+.. code-block:: javascript
+
+    const eventSource = new EventSource(hub, {
+        withCredentials: true
+    });
+
+Using cookies is the most secure and preferred way when the client is a web
+browser. If the client is not a web browser, then using an authorization header
+is the way to go.
 
 .. tip::
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2105,7 +2105,10 @@ paths
 **type**: ``array`` **default**: ``[]``
 
 This option allows to define an array of paths where the component will look
-for translation files.
+for translation files. The later a path is added, the more priority it has
+(translations from later paths overwrite earlier ones). Translations from the
+`default_path <reference-translator-default_path>` have more priority than
+translations from all these paths.
 
 .. _reference-translator-default_path:
 
diff --git a/setup.rst b/setup.rst
@@ -268,7 +268,7 @@ create new projects. If you use Composer, you need to tell the exact version:
 
 .. code-block:: terminal
 
-    $ composer create-project symfony/website-skeleton:^4.4 my_project_name
+    $ composer create-project symfony/website-skeleton:"^4.4" my_project_name
 
 The Symfony Demo application
 ----------------------------
