Merge branch '6.0' into 6.1

* 6.0:
  Use correct code-block

Author: OskarStark

reference/forms/types/choice.rst

@@ -320,7 +320,7 @@ choice is selected or not. If you need to get the full list of choices data and
 values, use the ``choices`` variable from the parent form of the choice entry
 (which is the ``ChoiceType`` itself) with ``form.parent.vars.choices``::
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# `true` or `false`, whether the current choice is selected as radio or checkbox #}
     {{ form.vars.data }}