From: Fabien Potencier Date: Tue, 8 Jul 2014 13:46:25 +0000 (+0200) Subject: fixed some typos X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5fd428ed7603ea63998716995c123c99648aab26;p=web%2Fkonrad%2Ftwig.git fixed some typos --- diff --git a/doc/filters/raw.rst b/doc/filters/raw.rst index 065e577..e5e5b12 100644 --- a/doc/filters/raw.rst +++ b/doc/filters/raw.rst @@ -13,8 +13,7 @@ if ``raw`` is the last filter applied to it: .. note:: - Be careful when using the ``raw`` filter inside expressions. This - snippet illustrates a case that can be confusing : + Be careful when using the ``raw`` filter inside expressions: .. code-block:: jinja @@ -29,8 +28,9 @@ if ``raw`` is the last filter applied to it: {{ (false ? hola : hello)|raw }} {% endautoescape %} - The first ternary won't be escaped : ``hello`` is marked as being safe and - Twig does not escape static values (see :doc:`escape<../tags/autoescape>`). - In the second ternary, even if ``hello`` is marked as safe, ``hola`` - remains unsafe and so will be the whole expression. On the other hand, the - third ternary will be marked as safe and the result won't be escaped. \ No newline at end of file + The first ternary statement is not escaped: ``hello`` is marked as being + safe and Twig does not escape static values (see + :doc:`escape<../tags/autoescape>`). In the second ternary statement, even + if ``hello`` is marked as safe, ``hola`` remains unsafe and so is the whole + expression. The third ternary statement is marked as safe and the result is + not escaped. diff --git a/doc/tags/autoescape.rst b/doc/tags/autoescape.rst index 09f8d47..4208d1a 100644 --- a/doc/tags/autoescape.rst +++ b/doc/tags/autoescape.rst @@ -67,7 +67,7 @@ Functions returning template data (like :doc:`macros` and .. note:: - Twig does not escape static expressions : + Twig does not escape static expressions: .. code-block:: jinja @@ -77,8 +77,7 @@ Functions returning template data (like :doc:`macros` and Will be rendered "Hello **world**". - .. note:: The chapter :doc:`Twig for Developers<../api>` gives more information - about when and how automatic escaping is applied. \ No newline at end of file + about when and how automatic escaping is applied.