Skip to content

Commit 2c33704

Browse files
committed
Merge pull request #1462 from mgiagnoni/mixed-typos2
Small typos
2 parents 584571f + 018f0fe commit 2c33704

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cookbook/controller/error_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ end-user, create a new template located at
5858

5959
In addition to the standard HTML error page, Symfony provides a default error
6060
page for many of the most common response formats, including JSON
61-
(``error.json.twig``), XML, (``error.xml.twig``), and even Javascript
61+
(``error.json.twig``), XML (``error.xml.twig``) and even Javascript
6262
(``error.js.twig``), to name a few. To override any of these templates, just
6363
create a new file with the same name in the
6464
``app/Resources/TwigBundle/views/Exception`` directory. This is the standard

cookbook/form/form_customization.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ Referencing Base Form Blocks (Twig specific)
342342

343343
So far, to override a particular form block, the best method is to copy
344344
the default block from `form_div_layout.html.twig`_, paste it into a different template,
345-
and the customize it. In many cases, you can avoid doing this by referencing
345+
and then customize it. In many cases, you can avoid doing this by referencing
346346
the base block when customizing it.
347347

348348
This is easy to do, but varies slightly depending on if your form block customizations
@@ -922,4 +922,4 @@ To render a help message below a field, pass in a ``help`` variable:
922922
.. tip::
923923
See :ref:`cookbook-form-theming-methods` for how to apply this customization.
924924

925-
.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
925+
.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

0 commit comments

Comments
 (0)