Merge branch 'mercure' of github.com:dunglas/symfony-docs into mercure

Author: dunglas

mercure.rst

@@ -88,7 +88,7 @@ Run the following command to start it:
 Configuration
 -------------
 
-The preferred way to configure the Mercure Bundle is using
+The preferred way to configure the MercureBundle is using
 :doc:`environment variables </configuration>`.
 
 Set the URL of your hub as the value of the ``MERCURE_PUBLISH_URL`` env var.
@@ -127,7 +127,7 @@ public updates (see the authorization_ section for further informations).
 .. caution::
 
     Don't put the secret key in ``MERCURE_JWT_SECRET``, it will not work!
-    This env var must contain a JWT, signed with the secret key.
+    This environment variable must contain a JWT, signed with the secret key.
 
     Also, be sure to keep both the secret key and the JWTs... secrets!
 
@@ -143,9 +143,7 @@ updates to the Hub.
 
 The ``Publisher`` service can be injected using the
 :doc:`autowiring </service_container/autowiring>` in any other
-service, including controllers:
-
-.. code-block:: php
+service, including controllers::
 
     // src/Controller/PublishController.php
     namespace App\Controller;
@@ -176,7 +174,7 @@ the **topic** being updated. This topic should be an IRI_
 of the resource being dispatched.
 
 Usually, this parameter contains the original URL of the resource
-transmitted to the client, but it can be any valid IRI, it doesn't
+transmitted to the client, but it can be any valid IRI_, it doesn't
 have to be an URL that exists (similarly to XML namespaces).
 
 The second parameter of the constructor is the content of the update.
@@ -245,9 +243,7 @@ and to configure properly a transport (if you don't, the handler will
 be called synchronously).
 
 Then, dispatch the Mercure ``Update`` to the Messenger's Message Bus,
-it will be handled automatically:
-
-.. code-block:: php
+it will be handled automatically::
 
     // src/Controller/PublishController.php
     namespace App\Controller;
@@ -281,11 +277,8 @@ in a ``Link`` HTTP header.
 
 .. image:: /_images/mercure/discovery.png
 
-Symfony makes it easy to create ``Link`` headers thanks to
-:doc:`WebLink Component </web_link>`.
-Install it, then use it through the ``AbstractController::addLink`` helper method:
-
-.. code-block:: php
+You can create ``Link`` headers with the :doc:`WebLink Component </web_link>`,
+by using the ``AbstractController::addLink`` helper method::
 
     // src/Controller/DiscoverController.php
     namespace App\Controller;
@@ -299,7 +292,8 @@ Install it, then use it through the ``AbstractController::addLink`` helper metho
     {
         public function __invoke(Request $request): JsonResponse
         {
-            $hubUrl = $this->getParameter('mercure.default_hub'); // This parameter is automatically created by the MercureBundle
+            // This parameter is automatically created by the MercureBundle
+            $hubUrl = $this->getParameter('mercure.default_hub'); 
 
             // Link: <http://localhost:3000/hub>; rel="mercure"
             $this->addLink($request, new Link('mercure', $hubUrl));
@@ -338,9 +332,7 @@ Authorization
 
 Mercure also allows to dispatch updates only to authorized clients.
 To do so, set the list of **targets** allowed to receive the update
-as the third parameter of the ``Update`` constructor:
-
-.. code-block:: php
+as the third parameter of the ``Update`` constructor::
 
     // src/Controller/Publish.php
     namespace App\Controller;
@@ -388,9 +380,7 @@ To generate the JWT, we'll use the ``lcobucci/jwt`` library. Install it:
 
     $ composer require lcobucci/jwt
 
-And here is the controller:
-
-.. code-block:: php
+And here is the controller::
 
     // src/Controller/DiscoverController.php
     namespace App\Controller;
@@ -436,9 +426,7 @@ Generating Programmatically The JWT Used to Publish
 
 Instead of directly storing a JWT in the configuration,
 you can create a service that will return the token used by
-the ``Publisher`` object.
-
-.. code-block:: php
+the ``Publisher`` object::
 
     // src/Mercure/MyJwtProvider.php
     namespace App\Mercure;
@@ -510,9 +498,7 @@ Start by installing the library using its official recipe:
     $ composer require api
 
 Then, creating the following entity is enough to get a fully-featured
-hypermedia API, and automatic update broadcasting through the Mercure hub:
-
-.. code-block:: php
+hypermedia API, and automatic update broadcasting through the Mercure hub::
 
     // src/Entity/Book.php
     namespace App\Entity;