Merge branch '6.4' into 7.0

* 6.4:
  Added a paragraph about HttpOptions object
  Minor tweak
  [AssetMapper] Adding note about importmap block
  [Routing] Improving language, shortening twig code

Author: OskarStark

frontend/asset_mapper.rst

@@ -1000,7 +1000,11 @@ both ``app`` and ``checkout``:
 .. code-block:: twig
 
     {# templates/products/checkout.html.twig #}
-    {% block javascripts %}
+    {#
+        Override an "importmap" block in base.html.twig.
+        If you don't have this, add it around the {{ importmap('app') }} call.
+    #}
+    {% block importmap %}
         {# do NOT call parent() #}
 
         {{ importmap('app', 'checkout') }}
@@ -1009,7 +1013,7 @@ both ``app`` and ``checkout``:
 By passing both ``app`` and ``checkout``, the ``importmap()`` function will
 output the ``importmap`` and also add a ``<script type="module">`` tag that
 loads the ``app.js`` file *and* the ``checkout.js`` file. It's important
-to *not* call ``parent()`` in the ``javascripts`` block. Each page can only
+to *not* call ``parent()`` in the ``importmap`` block. Each page can only
 have *one* importmap, so ``importmap()`` must be called exactly once.
 
 If, for some reason, you want to execute *only* ``checkout.js``

http_client.rst

@@ -144,6 +144,16 @@ method to retrieve a new instance of the client with new default options::
         'extra' => ['my-key' => 'my-value'],
     ]);
 
+Alternatively, the :class:`Symfony\\Component\\HttpClient\\HttpOptions` class brings most of the available options with
+type-hinted getters and setters::
+
+    $this->client = $client->withOptions(
+        (new HttpOptions())
+            ->setBaseUri('https://...')
+            ->setHeaders(['header-name' => 'header-value'])
+            ->toArray()
+    );
+
 Some options are described in this guide:
 
 * `Authentication`_

routing.rst

@@ -1581,15 +1581,11 @@ information in a controller via the ``Request`` object::
         }
     }
 
-You can get this information in services too injecting the ``request_stack``
-service to :doc:`get the Request object in a service </service_container/request>`.
-In templates, use the :ref:`Twig global app variable <twig-app-variable>` to get
-the current route and its attributes:
-
-.. code-block:: twig
-
-    {% set route_name = app.current_route %}
-    {% set route_parameters = app.current_route_parameters %}
+In services, you can get this information by
+:doc:`injecting the RequestStack service </service_container/request>`.
+In templates, use the :ref:`Twig global app variable <twig-app-variable>`
+to get the current route name (``app.current_route``) and its parameters
+(``app.current_route_parameters``).
 
 Special Routes
 --------------