Skip to content

Commit 95f4b91

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Minor fixes for the new Routing article
2 parents 6309eda + 11ea0ea commit 95f4b91

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

routing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,8 +1933,8 @@ provides some functions to generate both relative and absolute URLs:
19331933
Generating URLs in JavaScript
19341934
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19351935

1936-
If your JavaScript code is included in a Twig template, you can use the same
1937-
``path()`` and ``url()`` functions to generate the URLs and store them in
1936+
If your JavaScript code is included in a Twig template, you can use the
1937+
``path()`` and ``url()`` Twig functions to generate the URLs and store them in
19381938
JavaScript variables. The ``escape()`` function is needed to escape any
19391939
non-JavaScript-safe values:
19401940

@@ -2100,7 +2100,7 @@ method) or globally with these configuration parameters:
21002100
$container->setParameter('asset.request_context.secure', true);
21012101
21022102
Outside of console commands, use the ``schemes`` option to define the scheme of
2103-
each route explicitly::
2103+
each route explicitly:
21042104

21052105
.. configuration-block::
21062106

0 commit comments

Comments
 (0)