Merge branch '5.4' into 6.0

* 5.4:
  Minor tweaks
  Update templates.rst

Author: javiereguiluz

templates.rst

@@ -513,6 +513,9 @@ provided by Symfony:
                 # the path of the template to render
                 template:  'static/privacy.html.twig'
 
+                # the response status code (default: 200)
+                statusCode: 200
+
                 # special options defined by Symfony to set the page cache
                 maxAge:    86400
                 sharedAge: 86400
@@ -539,6 +542,9 @@ provided by Symfony:
                 <!-- the path of the template to render -->
                 <default key="template">static/privacy.html.twig</default>
 
+                <!-- the response status code (default: 200) -->
+                <default key="statusCode">200</default>
+
                 <!-- special options defined by Symfony to set the page cache -->
                 <default key="maxAge">86400</default>
                 <default key="sharedAge">86400</default>
@@ -567,6 +573,9 @@ provided by Symfony:
                     // the path of the template to render
                     'template'  => 'static/privacy.html.twig',
 
+                    // the response status code (default: 200)
+                    'statusCode' => 200,
+
                     // special options defined by Symfony to set the page cache
                     'maxAge'    => 86400,
                     'sharedAge' => 86400,