Merge remote-tracking branch 'sensio/2.7' into 2.7

* sensio/2.7: Move redirection_map from root tweaks! Removing duplicated description of the Twig path/url functions Link to routing expressions Re-reading the routing chapter
symfony · Jul 14, 2016 · 3918ee8 · 3918ee8
2 parents 715227e + 545a4cb
commit 3918ee8
Show file tree

Hide file tree

Showing 8 changed files with 287 additions and 514 deletions.
diff --git a/redirection_map → _build/redirection_map b/redirection_map → _build/redirection_map
@@ -169,7 +169,7 @@
 /cookbook/routing/debug /routing/debug
 /cookbook/routing/external_resources /routing/external_resources
 /cookbook/routing/extra_information /routing/extra_information
-/cookbook/routing/method_parameters /routing/method_parameters
+/cookbook/routing/method_parameters /routing/requirements
 /cookbook/routing/optional_placeholders /routing/optional_placeholders
 /cookbook/routing/redirect_in_config /routing/redirect_in_config
 /cookbook/routing/redirect_trailing_slash /routing/redirect_trailing_slash

diff --git a/form/action_method.rst b/form/action_method.rst
@@ -59,5 +59,5 @@ to the ``form()`` or the ``form_start()`` helper functions:
     will insert a hidden field with the name ``_method`` that stores this method.
     The form will be submitted in a normal POST request, but Symfony's router
     is capable of detecting the ``_method`` parameter and will interpret it as
-    a PUT, PATCH or DELETE request. Read the cookbook chapter
-    ":doc:`/routing/method_parameters`" for more information.
+    a PUT, PATCH or DELETE request. See the :ref:`configuration-framework-http_method_override`
+    option.
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -148,7 +148,7 @@ named ``kernel.http_method_override``.
 
 .. seealso::
 
-    For more information, see :doc:`/routing/method_parameters`.
+    For more information, see :doc:`/form/action_method`.
 
 .. caution::
 

diff --git a/reference/forms/types/options/method.rst.inc b/reference/forms/types/options/method.rst.inc
@@ -21,8 +21,8 @@ is used to decide whether to process the form submission in the
 
     When the method is PUT, PATCH, or DELETE, Symfony will automatically
     render a ``_method`` hidden field in your form. This is used to "fake"
-    these HTTP methods, as they're not supported on standard browsers. For
-    more information, see :doc:`/routing/method_parameters`.
+    these HTTP methods, as they're not supported on standard browsers. This can
+    be useful when using :ref:`method routing requirements <routing-method-requirement>`.
 
 .. note::