Skip to content

Commit 1f55e13

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Adding folder name [HTTP Cache] Fix grammar issue
2 parents 3e06e90 + 08548d1 commit 1f55e13

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

frontend/encore/versioning.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ To link to these assets, Encore creates two files ``entrypoints.json`` and
2828
Loading Assets from ``entrypoints.json`` & ``manifest.json``
2929
------------------------------------------------------------
3030

31-
Whenever you run Encore, two configuration files are generated: ``entrypoints.json``
31+
Whenever you run Encore, two configuration files are generated in your
32+
output folder (default location: ``public/build/``): ``entrypoints.json``
3233
and ``manifest.json``. Each file is similar, and contains a map to the final, versioned
33-
filename.
34+
filenames.
3435

35-
The first file - ``entrypoints.json`` - is used by the ``encore_entry_script_tags()``
36+
The first file ``entrypoints.json`` is used by the ``encore_entry_script_tags()``
3637
and ``encore_entry_link_tags()`` Twig helpers. If you're using these, then your
3738
CSS and JavaScript files will render with the new, versioned filename. If you're
3839
not using Symfony, your app will need to read this file in a similar way.

http_cache/ssi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The ``render_ssi`` twig helper will generate something like:
130130

131131
<!--#include virtual="/_fragment?_hash=abcdef1234&_path=_controller=App\Controller\ProfileController::gdpr" -->
132132

133-
``render_ssi`` ensures that SSI directive are generated only if the request
133+
``render_ssi`` ensures that SSI directive is generated only if the request
134134
has the header requirement like ``Surrogate-Capability: device="SSI/1.0"``
135135
(normally given by the web server).
136136
Otherwise it will embed directly the sub-response.

0 commit comments

Comments
 (0)