Merge branch '2.7' into 2.8

javiereguiluz · javiereguiluz · commit d3dd2f2c35a2 · 2018-01-17T17:01:00.000+01:00
* 2.7: Fixed the default value for toolbar configuration Close the tag minor #9051 Update routing.rst (rickwest)
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
@@ -23,7 +23,7 @@ Configuration
 toolbar
 ~~~~~~~
 
-**type**: ``boolean`` **default**: ``true``
+**type**: ``boolean`` **default**: ``false``
 
 It enables and disables the toolbar entirely. Usually you set this to ``true``
 in the ``dev`` and ``test`` environments and to ``false`` in the ``prod``
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -213,7 +213,7 @@ And update the template as follows:
 
         <a href="#" 
             class="add-another-collection-widget"
-            data-list="#email-field-list>Add another email</a>
+            data-list="#email-field-list">Add another email</a>
 
         {# ... #}
     {{ form_end(form) }}
diff --git a/routing.rst b/routing.rst
@@ -651,7 +651,7 @@ But if you pass extra ones, they will be added to the URI as a query string::
 
     $this->get('router')->generate('blog', array(
         'page' => 2,
-        'category' => 'Symfony'
+        'category' => 'Symfony',
     ));
     // /blog/2?category=Symfony
 
