Merge branch '2.8' into 3.2

* 2.8:
  Use Twig's namespaced paths
  Minor reword
  Clearify setup of basic auth for test environment

Author: weaverryan

profiler/data_collector.rst

@@ -153,7 +153,7 @@ block and set the value of two variables called ``icon`` and ``text``:
 
 .. code-block:: html+twig
 
-    {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+    {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
     {% block toolbar %}
         {% set icon %}

testing/http_authentication.rst

@@ -30,14 +30,16 @@ firewall, but only in the configuration file used by tests:
         # app/config/config_test.yml
         security:
             firewalls:
-                your_firewall_name:
+                # replace 'main' by the name of your own firewall
+                main:
                     http_basic: ~
 
     .. code-block:: xml
 
         <!-- app/config/config_test.xml -->
         <security:config>
-            <security:firewall name="your_firewall_name">
+            <!-- replace 'main' by the name of your own firewall -->
+            <security:firewall name="main">
               <security:http-basic />
            </security:firewall>
         </security:config>
@@ -47,7 +49,8 @@ firewall, but only in the configuration file used by tests:
         // app/config/config_test.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
-                'your_firewall_name' => array(
+                // replace 'main' by the name of your own firewall
+                'main' => array(
                     'http_basic' => array(),
                 ),
             ),