Skip to content

Commit a2a6d78

Browse files
committed
Merge pull request #3159 from bicpi/revise_twig_reference
[Reference][Twig] Fix typos and formatting
2 parents abd4b2d + 95cd59e commit a2a6d78

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

reference/twig_reference.rst

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Functions
3232
| ``render(path('route', {params}))`` | |
3333
| ``render(url('route', {params}))`` | |
3434
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
35-
| ``render_esi(controller('B:C:a', {params}))`` | This will generates an ESI tag when possible or fallback to the ``render`` |
35+
| ``render_esi(controller('B:C:a', {params}))`` | This will generate an ESI tag when possible or fallback to the ``render`` |
3636
| ``render_esi(url('route', {params}))`` | behavior otherwise. For more information, see :ref:`templating-embedding-controller`. |
3737
| ``render_esi(path('route', {params}))`` | |
3838
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
@@ -75,28 +75,28 @@ Functions
7575
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
7676
| ``logout_path(key)`` | This will generate the relative logout URL for the given firewall |
7777
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
78-
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute url |
78+
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute URL |
7979
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
80-
| ``path(name, parameters = {})`` | Get a relative url for the given route, more information in |
80+
| ``path(name, parameters = {})`` | Get a relative URL for the given route, more information in |
8181
| | ":ref:`book-templating-pages`". |
8282
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
83-
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute url |
83+
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute URL |
8484
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
8585

8686
Filters
8787
-------
8888

8989
.. versionadded:: 2.1
90-
The ``humanize`` filter was added in Symfony2.1
90+
The ``humanize`` filter was added in Symfony 2.1
9191

9292
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
9393
| Filter Syntax | Usage |
9494
+=================================================================================+===================================================================+
9595
| ``text|humanize`` | Makes a technical name human readable (replaces underscores by |
96-
| | spaces and capitalizes the string) |
96+
| | spaces and capitalizes the string). |
9797
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
9898
| ``text|trans(arguments = {}, domain = 'messages', locale = null)`` | This will translate the text into the current language, more |
99-
| | information in . |
99+
| | information in |
100100
| | :ref:`Translation Filters <book-translation-filters>`. |
101101
+---------------------------------------------------------------------------------+-------------------------------------------------------------------+
102102
| ``text|transchoice(count, arguments = {}, domain = 'messages', locale = null)`` | This will translate the text with pluralization, more information |
@@ -165,8 +165,8 @@ Global Variables
165165
+-------------------------------------------------------+------------------------------------------------------------------------------------+
166166
| Variable | Usage |
167167
+=======================================================+====================================================================================+
168-
| ``app`` *Attributes*: ``app.user``, ``app.request`` | The ``app`` variable is available everywhere, and gives you quick |
169-
| ``app.session``, ``app.environment``, ``app.debug`` | access to many commonly needed objects. The ``app`` variable is |
168+
| ``app`` *Attributes*: ``app.user``, ``app.request``, | The ``app`` variable is available everywhere, and gives you quick |
169+
| ``app.session``, ``app.environment``, ``app.debug``, | access to many commonly needed objects. The ``app`` variable is |
170170
| ``app.security`` | instance of :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables` |
171171
+-------------------------------------------------------+------------------------------------------------------------------------------------+
172172

@@ -176,12 +176,11 @@ Symfony Standard Edition Extensions
176176
The Symfony Standard Edition adds some bundles to the Symfony2 Core Framework.
177177
Those bundles can have other Twig extensions:
178178

179-
* **Twig Extension** includes all extensions that do not belong to the
180-
Twig core but can be interesting. You can read more in
181-
`the official Twig Extensions documentation`_
179+
* **Twig Extensions** includes some interesting extensions that do not belong to the
180+
Twig core. You can read more in `the official Twig Extensions documentation`_;
182181
* **Assetic** adds the ``{% stylesheets %}``, ``{% javascripts %}`` and
183182
``{% image %}`` tags. You can read more about them in
184-
:doc:`the Assetic Documentation </cookbook/assetic/asset_management>`;
183+
:doc:`the Assetic Documentation </cookbook/assetic/asset_management>`.
185184

186185
.. _`the official Twig Extensions documentation`: http://twig.sensiolabs.org/doc/extensions/index.html
187186
.. _`http://twig.sensiolabs.org/documentation`: http://twig.sensiolabs.org/documentation

0 commit comments

Comments
 (0)