diff --git a/book/controller.rst b/book/controller.rst
index 1f51d5ed4c5..229be2d9777 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
 
-        <?php foreach ($view['session']->getFlash('notice') as $message): ?>
+        <?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
             <div class="flash-notice">
                 <?php echo "<div class='flash-error'>$message</div>" ?>
             </div>
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