Merge branch '5.4' into 6.0

* 5.4:
  Update routing.rst

Author: javiereguiluz

routing.rst

@@ -241,7 +241,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: