Merge branch '5.4' into 6.0

* 5.4:
  Adding folder name
  [HTTP Cache] Fix grammar issue

Author: javiereguiluz

frontend/encore/versioning.rst

@@ -28,11 +28,12 @@ To link to these assets, Encore creates two files ``entrypoints.json`` and
 Loading Assets from ``entrypoints.json`` & ``manifest.json``
 ------------------------------------------------------------
 
-Whenever you run Encore, two configuration files are generated: ``entrypoints.json``
+Whenever you run Encore, two configuration files are generated in your
+output folder (default location: ``public/build/``): ``entrypoints.json``
 and ``manifest.json``. Each file is similar, and contains a map to the final, versioned
-filename.
+filenames.
 
-The first file - ``entrypoints.json`` - is used by the ``encore_entry_script_tags()``
+The first file – ``entrypoints.json`` – is used by the ``encore_entry_script_tags()``
 and ``encore_entry_link_tags()`` Twig helpers. If you're using these, then your
 CSS and JavaScript files will render with the new, versioned filename. If you're
 not using Symfony, your app will need to read this file in a similar way.

http_cache/ssi.rst

@@ -130,7 +130,7 @@ The ``render_ssi`` twig helper will generate something like:
 
     <!--#include virtual="/_fragment?_hash=abcdef1234&_path=_controller=App\Controller\ProfileController::gdpr" -->
 
-``render_ssi`` ensures that SSI directive are generated only if the request
+``render_ssi`` ensures that SSI directive is generated only if the request
 has the header requirement like ``Surrogate-Capability: device="SSI/1.0"``
 (normally given by the web server).
 Otherwise it will embed directly the sub-response.