Skip to content

Commit 9c56f76

Browse files
committed
Merge branch '4.2'
* 4.2: [Encore] Fixed typo fix indention Fix typo in http_kernel_controller_resolver.rst
2 parents 2b65686 + 6f78a1f commit 9c56f76

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

components/config/definition.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ In YAML you may have:
476476
.. code-block:: yaml
477477
478478
# This value is only used for the search results page.
479-
entries_per_page: 25
479+
entries_per_page: 25
480480
481481
and in XML:
482482

create_framework/http_kernel_controller_resolver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Update the route definition accordingly::
2525
$routes->add('leap_year', new Routing\Route('/is_leap_year/{year}', [
2626
'year' => null,
2727
'_controller' => [new LeapYearController(), 'index'],
28-
)));
28+
]));
2929

3030
The move is pretty straightforward and makes a lot of sense as soon as you
3131
create more pages but you might have noticed a non-desirable side-effect...

frontend/encore/babel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The ``@babel/preset-env`` preset rewrites your JavaScript so that the final synt
4141
will work in whatever browsers you want. To configure the browsers that you need
4242
to support, see :ref:`browserslist_package_config`.
4343

44-
After change our "browerslist" config, you will need to manually remove the babel
44+
After changing your "browserslist" config, you will need to manually remove the babel
4545
cache directory:
4646

4747
.. code-block:: terminal

0 commit comments

Comments
 (0)