Merge branch '5.2' into 5.x

* 5.2:
  update doc with max-age
  [Mercure] Fix configuration-block
  Fix typo
  Minor fixes

Author: javiereguiluz

controller.rst

@@ -271,7 +271,7 @@ the argument by its name:
             ->addTag('controller.service_arguments')
             ->setBindings([
                 '$logger' => new Reference('monolog.logger.doctrine'),
-                '$projectDir' => '%kernel.project_dir%'
+                '$projectDir' => '%kernel.project_dir%',
             ])
         ;
 

frontend/encore/dev-server.rst

@@ -10,7 +10,7 @@ While developing, instead of using ``yarn encore dev --watch``, you can use the
 
 This builds and serves the front-end assets from a new server. This server runs at
 ``localhost:8080`` by default, meaning your build assets are available at ``localhost:8080/build``.
-This server does not actually write the files to disk; instead it servers them from memory,
+This server does not actually write the files to disk; instead it serves them from memory,
 allowing for hot module reloading.
 
 As a consequence, the ``link`` and ``script`` tags need to point to the new server. If you're using the

http_cache/expiration.rst

@@ -34,7 +34,7 @@ additional directives):
 
 .. code-block:: text
 
-    Cache-Control: public, maxage=600
+    Cache-Control: public, max-age=600
 
 .. note::
 

introduction/from_flat_php_to_symfony.rst

@@ -528,7 +528,7 @@ The Sample Application in Symfony
 
 The blog has come a *long* way, but it still contains a lot of code for such
 a basic application. Along the way, you've made a basic routing system and
-a method using ``ob_start()`` and ``ob_get_clean()`` to render templates.
+a function using ``ob_start()`` and ``ob_get_clean()`` to render templates.
 If, for some reason, you needed to continue building this "framework" from
 scratch, you could at least use Symfony's standalone :doc:`Routing </routing>`
 component and :doc:`Twig </templates>`, which already solve these problems.

mercure.rst

@@ -402,7 +402,7 @@ This cookie will be automatically sent by the web browser when connecting to the
 Then, the Hub will verify the validity of the provided JWT, and extract the topic selectors
 from it.
 
-add your JWT secret to the configuration as follow ::
+Add your JWT secret to the configuration as follow:
 
 .. configuration-block::
 

page_creation.rst

@@ -220,7 +220,7 @@ Make sure that ``LuckyController`` extends Symfony's base
           // ...
       }
 
-Now, use the handy ``render()`` function to render a template. Pass it a ``number``
+Now, use the handy ``render()`` method to render a template. Pass it a ``number``
 variable so you can use it in Twig::
 
     // src/Controller/LuckyController.php