lucasts
diff --git a/‎guides/map.rst.inc
Copy file name to clipboardExpand all lines: guides/map.rst.inc
+2-2Lines changed: 2 additions & 2 deletions b/‎guides/map.rst.inc
Copy file name to clipboardExpand all lines: guides/map.rst.inc
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎guides/templating/Twig.rst
Copy file name to clipboardExpand all lines: guides/templating/Twig.rst
+6Lines changed: 6 additions & 0 deletions b/‎guides/templating/Twig.rst
Copy file name to clipboardExpand all lines: guides/templating/Twig.rst
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎guides/templating/index.rst
Copy file name to clipboardExpand all lines: guides/templating/index.rst
+1-2Lines changed: 1 addition & 2 deletions b/‎guides/templating/index.rst
Copy file name to clipboardExpand all lines: guides/templating/index.rst
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎quick_tour/the_architecture.rst
Copy file name to clipboardExpand all lines: quick_tour/the_architecture.rst
-3Lines changed: 0 additions & 3 deletions b/‎quick_tour/the_architecture.rst
Copy file name to clipboardExpand all lines: quick_tour/the_architecture.rst
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎quick_tour/the_view.rst
Copy file name to clipboardExpand all lines: quick_tour/the_view.rst
+14Lines changed: 14 additions & 0 deletions b/‎quick_tour/the_view.rst
Copy file name to clipboardExpand all lines: quick_tour/the_view.rst
+14Lines changed: 14 additions & 0 deletions
@@ -1,7 +1,7 @@
 * **Templating**:
 
-  * :doc:`/guides/templating/helpers` | 
-  * :doc:`Twig </guides/templating/Twig>`
+  * :doc:`Twig </guides/templating/Twig>` | 
+  * :doc:`/guides/templating/helpers`
 
 * **Doctrine**:
 
 
@@ -158,6 +158,12 @@ specialized tags:
     {# embed another controller response #}
     {% render 'BlogBundle:Post:list' with ['limit': 2], ['alt': 'BlogBundle:Post:error'] %}
 
+Output Escaping
+---------------
+
+Twig is configured to automatically escapes all output by default. Read Twig
+documentation to learn more about output escaping and the Escaper extension.
+
 .. _twig_extension_tag:
 
 Enabling Custom Twig Extensions
 
@@ -4,6 +4,5 @@ Templating
 .. toctree::
    :maxdepth: 2
 
-   overview
-   helpers
    Twig
+   helpers
@@ -176,7 +176,6 @@ PHP. Have a look at the default configuration:
             router:        { resource: "%kernel.root_dir%/config/routing.yml" }
             validation:    { enabled: true, annotations: true }
             templating:
-                escaping:       htmlspecialchars
                 #assets_version: SomeVersionScheme
             session:
                 default_locale: en
@@ -208,7 +207,6 @@ PHP. Have a look at the default configuration:
         <app:config csrf-secret="xxxxxxxxxx" charset="UTF-8" error-handler="null">
             <app:router resource="%kernel.root_dir%/config/routing.xml" />
             <app:validation enabled="true" annotations="true" />
-            <app:templating escaping="htmlspecialchars" />
             <app:session default-locale="en" lifetime="3600" />
         </app:config>
 
@@ -244,7 +242,6 @@ PHP. Have a look at the default configuration:
             'router'        => array('resource' => '%kernel.root_dir%/config/routing.php'),
             'validation'    => array('enabled' => true, 'annotations' => true),
             'templating'    => array(
-                'escaping'        => 'htmlspecialchars'
                 #'assets_version' => "SomeVersionScheme",
             ),
             'session' => array(
 
@@ -254,6 +254,20 @@ need to also add the following code in your main layout:
     <?php echo $view['javascripts'] ?>
     <?php echo $view['stylesheets'] ?>
 
+Output Escaping
+---------------
+
+When using PHP templates, escape variables whenever they are displayed to the
+user::
+
+    <?php echo $view->escape($var) ?>
+
+By default, the ``escape()`` method assumes that the variable is outputted
+within an HTML context. The second argument lets you change the context. For
+instance, to output something in a JavaScript script, use the ``js`` context::
+
+    <?php echo $view->escape($var, 'js') ?>
+
 Final Thoughts
 --------------