From 248b8f9001e9d5fceeec356af5b7e8cf757d51f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Sat, 30 Mar 2013 19:44:18 +0100 Subject: [PATCH 1/3] Facelift of book/controller.rst issue #2377 --- book/controller.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/controller.rst b/book/controller.rst index 1f51d5ed4c5..e63cd9a4a92 100644 --- a/book/controller.rst +++ b/book/controller.rst @@ -296,7 +296,7 @@ the following guidelines in mind while you develop. * **Not all routing parameters need to be arguments on your controller** - If, for example, the ``last_name`` weren't important for your controller, + If, for example, the ``last_name`` is not important for your controller, you could omit it entirely:: public function indexAction($first_name, $color) @@ -686,7 +686,7 @@ the ``notice`` message: .. code-block:: php - getFlash('notice') as $message): ?> + getFlashBag('notice') as $message): ?>
$message
" ?> From edcb20bcefb90fdbb7ad7108259afbb4e892ca15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Sat, 30 Mar 2013 23:42:30 +0100 Subject: [PATCH 2/3] Update controller.rst --- book/controller.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/controller.rst b/book/controller.rst index e63cd9a4a92..229be2d9777 100644 --- a/book/controller.rst +++ b/book/controller.rst @@ -686,7 +686,7 @@ the ``notice`` message: .. code-block:: php - getFlashBag('notice') as $message): ?> + getFlashBag()->get('notice') as $message): ?>
$message
" ?> From 574f005431070db9d1ce2f98cd8e647411d7b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= Date: Sun, 31 Mar 2013 01:13:16 +0100 Subject: [PATCH 3/3] Update templating.rst Ok for me, it seems to me that the behavior will change in hinclude with Twig but after checking it is not yet valid. Documentation visible symfony.com does not match perfectly with the master: in the case of the {% url render () ... but this is corrected on the master. --- book/templating.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/book/templating.rst b/book/templating.rst index 0a1639f3802..f8624606daf 100644 --- a/book/templating.rst +++ b/book/templating.rst @@ -1340,8 +1340,11 @@ is being escaped for HTML output. In some cases, you'll need to disable output escaping when you're rendering a variable that is trusted and contains markup that should not be escaped. Suppose that administrative users are able to write articles that contain -HTML code. By default, Twig will escape the article body. To render it normally, -add the ``raw`` filter: ``{{ article.body|raw }}``. +HTML code. By default, Twig will escape the article body. + +To render it normally, add the ``raw`` filter: + +``{{ article.body|raw }}``. You can also disable output escaping inside a ``{% block %}`` area or for an entire template. For more information, see `Output Escaping`_ in