Nov 10, 2016 · Oct 26, 2016
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst

            <twig:config
                auto-reload="%kernel.debug%"
                autoescape="filename"
                autoescape="name"
                base-template-class="Twig_Template"
                cache="%kernel.cache_dir%/twig"
                charset="%kernel.charset%"
                 'pi'  => 3.14,
             ),
             'auto_reload'          => '%kernel.debug%',
             'autoescape'           => 'filename',
             'autoescape'           => 'name',
             'base_template_class'  => 'Twig_Template',
             'cache'                => '%kernel.cache_dir%/twig',
             'charset'              => '%kernel.charset%',
 autoescape
 ~~~~~~~~~~

 **type**: ``boolean`` or ``string`` **default**: ``'filename'``
 **type**: ``boolean`` or ``string`` **default**: ``'name'``

 If set to ``false``, automatic escaping is disabled (you can still escape each content
 individually in the templates).

 If set to a string, the template contents are escaped using the strategy with
 that name. Allowed values are ``html``, ``js``, ``css``, ``url``, ``html_attr``
 and ``filename``. The default value is ``filename``. This strategy escapes
 contentsaccording to thefilenameextension (e.g. it uses ``html`` for
 ``*.html.twig``templates and ``js`` for ``*.js.html`` templates).
 and ``name``. The default value is ``name``. This strategy escapes contents
 according to thetemplate nameextension (e.g. it uses ``html`` for ``*.html.twig``
 templates and ``js`` for ``*.js.html`` templates).

 .. tip::
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,7 +62,7 @@ TwigBundle Configuration ("twig")

		<twig:config
		auto-reload="%kernel.debug%"
		autoescape="filename"
		autoescape="name"
		base-template-class="Twig_Template"
		cache="%kernel.cache_dir%/twig"
		charset="%kernel.charset%"
Expand DownExpand Up		@@ -93,7 +93,7 @@ TwigBundle Configuration ("twig")
		'pi' => 3.14,
		),
		'auto_reload' => '%kernel.debug%',
		'autoescape' => 'filename',
		'autoescape' => 'name',
		'base_template_class' => 'Twig_Template',
		'cache' => '%kernel.cache_dir%/twig',
		'charset' => '%kernel.charset%',
Expand DownExpand Up		@@ -127,7 +127,7 @@ compiled again automatically.
		autoescape
		~~~~~~~~~~

		type: ``boolean`` or ``string`` default: ``'filename'``
		type: ``boolean`` or ``string`` default: ``'name'``

		If set to ``false``, automatic escaping is disabled (you can still escape each content
		individually in the templates).
Expand All		@@ -141,9 +141,9 @@ individually in the templates).

		If set to a string, the template contents are escaped using the strategy with
		that name. Allowed values are ``html``, ``js``, ``css``, ``url``, ``html_attr``
		and ``filename``. The default value is ``filename``. This strategy escapes
		contentsaccording to thefilenameextension (e.g. it uses ``html`` for
		``.html.twig``templates and ``js`` for ``.js.html`` templates).
		and ``name``. The default value is ``name``. This strategy escapes contents
		according to thetemplate nameextension (e.g. it uses ``html`` for ``*.html.twig``
		templates and ``js`` for ``*.js.html`` templates).

		.. tip::

Expand Down