Merge branch '2.7' into 2.8

* 2.7:
  Improved the example to generate URLs in the console
  minor #8704 Client's history clear alternative (takman1)
  use the ref role instead of URLs

Author: javiereguiluz

components/browser_kit.rst

@@ -225,7 +225,7 @@ also delete all the cookies::
     $client = new Client();
     $client->request('GET', '/');
 
-    // delete history
+    // reset the client (history and cookies are cleared too)
     $client->restart();
 
 Learn more

console/request_context.rst

@@ -72,11 +72,13 @@ from the ``router`` service and override its settings::
     {
         protected function execute(InputInterface $input, OutputInterface $output)
         {
-            $context = $this->getContainer()->get('router')->getContext();
+            $router = $this->getContainer()->get('router');
+            $context = $router->getContext();
             $context->setHost('example.com');
             $context->setScheme('https');
             $context->setBaseUrl('my/path');
 
-            // ... your code here
+            $url = $router->generate('route-name', array('param-name' => 'param-value'));
+            // ...
         }
     }

form/disabling_validation.rst

@@ -24,7 +24,6 @@ for example whether an uploaded file was too large or whether non-existing
 fields were submitted.
 
 The submission of extra form fields can be controlled with the
-`allow_extra_fields config option`_ and the maximum upload file size should be
-handled via your PHP and web server configuration.
-
-.. _`allow_extra_fields config option`: https://symfony.com/doc/current/reference/forms/types/form.html#allow-extra-fields
+:ref:`allow_extra_fields config option <form-option-allow-extra-fields>` and
+the maximum upload file size should be handled via your PHP and web server
+configuration.

reference/forms/types/form.rst

@@ -54,6 +54,8 @@ Field Options
 
 .. include:: /reference/forms/types/options/action.rst.inc
 
+.. _form-option-allow-extra-fields:
+
 allow_extra_fields
 ~~~~~~~~~~~~~~~~~~