Merge branch '6.2' into 6.3

* 6.2:
  Update routing.rst
  [Controller] Errors on namespace value_resolver

Author: javiereguiluz

controller/value_resolver.rst

@@ -292,7 +292,7 @@ and adding a priority:
                 autowire: true
             # ...
 
-            App\ArgumentResolver\BookingIdValueResolver:
+            App\ValueResolver\BookingIdValueResolver:
                 tags:
                     - { name: controller.argument_value_resolver, priority: 150 }
 
@@ -310,7 +310,7 @@ and adding a priority:
                 <defaults autowire="true"/>
                 <!-- ... -->
 
-                <service id="App\ArgumentResolver\BookingIdValueResolver">
+                <service id="App\ValueResolver\BookingIdValueResolver">
                     <tag name="controller.argument_value_resolver" priority="150"/>
                 </service>
             </services>
@@ -322,7 +322,7 @@ and adding a priority:
         // config/services.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        use App\ArgumentResolver\BookingIdValueResolver;
+        use App\ValueResolver\BookingIdValueResolver;
 
         return static function (ContainerConfigurator $container) {
             $services = $configurator->services();

routing.rst

@@ -249,7 +249,8 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
     route with a different method from an HTML form, add a hidden field called
     ``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT">``).
     If you create your forms with :doc:`Symfony Forms </forms>` this is done
-    automatically for you.
+    automatically for you when the :ref:`framework.http_method_override <configuration-framework-http_method_override>`
+    option is ``true``.
 
 .. _routing-matching-expressions: