Skip to content

Commit a5bf0f7

Browse files
committed
Merge branch '4.4'
* 4.4: Fixed some RST issues in the recently reworded Templates article
2 parents 213d9a6 + 253c78b commit a5bf0f7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

templates.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ Rendering a Template Directly from a Route
455455

456456
Although templates are usually rendered in controllers and services, you can
457457
render static pages that don't need any variables directly from the route
458-
definition. Use the special ``TemplateController`` provided by Symfony::
458+
definition. Use the special ``TemplateController`` provided by Symfony:
459459

460460
.. configuration-block::
461461

@@ -596,7 +596,7 @@ Symfony provides a :ref:`dump() function <components-var-dumper-dump>` as an
596596
improved alternative to PHP's ``var_dump()`` function. This function is useful
597597
to inspect the contents of any variable and you can use it in Twig templates too.
598598

599-
First, make sure that the VarDumper component is installed in the application::
599+
First, make sure that the VarDumper component is installed in the application:
600600

601601
.. code-block:: terminal
602602
@@ -816,8 +816,8 @@ complex applications:
816816

817817
* ``templates/base.html.twig``, defines the common elements of all application
818818
templates, such as ``<head>``, ``<header>``, ``<footer>``, etc.;
819-
* ``templates/layout.html.twig``, extends from ``base.html.twig``and defines the
820-
content structure used in all or most of the pages, such as a two-column
819+
* ``templates/layout.html.twig``, extends from ``base.html.twig`` and defines
820+
the content structure used in all or most of the pages, such as a two-column
821821
content + sidebar layout. Some sections of the application can define their
822822
own layouts (e.g. ``templates/blog/layout.html.twig``);
823823
* ``templates/*.html.twig``, the application pages which extend from the main

0 commit comments

Comments
 (0)