Merge branch '5.1'

javiereguiluz · javiereguiluz · commit 3a880297aaae · 2020-06-13T17:11:19.000+02:00
* 5.1:
  Improve the Best Practice about forms with multiple buttons
  Removed the file comparing Assetic and Encore
diff --git a/_build/redirection_map b/_build/redirection_map
@@ -505,3 +505,4 @@
 /components/templating https://github.com/symfony/templating
 /components/error_handler https://github.com/symfony/error-handler
 /components/class_loader https://github.com/symfony/class-loader
+/frontend/encore/versus-assetic /frontend
diff --git a/best_practices.rst b/best_practices.rst
@@ -299,6 +299,10 @@ to add buttons in the templates. This also improves the separation of concerns,
 because the button styling (CSS class and other attributes) is defined in the
 template instead of in a PHP class.
 
+However, if you create a :doc:`form with multiple submit buttons </form/multiple_buttons>`
+you should define them in the controller instead of the template. Otherwise, you
+won't be able to check which button was clicked when handling the form in the controller.
+
 Define Validation Constraints on the Underlying Object
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/frontend.rst b/frontend.rst
@@ -80,7 +80,6 @@ Issues & Questions
 ..................
 
 * :doc:`FAQ & Common Issues </frontend/encore/faq>`
-* :doc:`/frontend/encore/versus-assetic`
 
 Full API
 ........
diff --git a/frontend/encore/versus-assetic.rst b/frontend/encore/versus-assetic.rst
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1679,7 +1679,7 @@ version
 This option is used to *bust* the cache on assets by globally adding a query
 parameter to all rendered asset paths (e.g. ``/images/logo.png?v2``). This
 applies only to assets rendered via the Twig ``asset()`` function (or PHP
-equivalent) as well as assets rendered with Assetic.
+equivalent).
 
 For example, suppose you have the following:
 
