Merge branch '3.4' into 4.2

* 3.4:
  use code-block twig instead of html+twig

Author: javiereguiluz

best_practices/forms.rst

@@ -177,7 +177,7 @@ One of the simplest ways - which is especially useful during development -
 is to render the form tags and use the ``form_widget()`` function to render
 all of the fields:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_start(form, {attr: {class: 'my-form-class'} }) }}
         {{ form_widget(form) }}

form/form_customization.rst

@@ -30,7 +30,7 @@ The next step is to use the :ref:`form_start() <reference-forms-twig-start>`,
 :ref:`form_row() <reference-forms-twig-row>` Twig functions to render the
 different form parts so you can customize them adding HTML elements and attributes:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_start(form) }}
         <div class="my-custom-class-for-errors">

form/form_themes.rst

@@ -144,7 +144,7 @@ You can also apply a form theme to a specific child of your form:
 This is useful when you want to have a custom theme for a nested form that's
 different than the one of your main form. Specify both your themes:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% form_theme form 'form/my_custom_theme.html.twig' %}
     {% form_theme form.a_child_form 'form/my_other_theme.html.twig' %}

forms.rst

@@ -154,7 +154,7 @@ done by passing a special form "view" object to your template (notice the
 ``$form->createView()`` in the controller above) and using a set of
 :ref:`form helper functions <reference-form-twig-functions>`:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# templates/task/new.html.twig #}
     {{ form(form) }}
@@ -412,7 +412,7 @@ Validation is a very powerful feature of Symfony and has its own
     but are being prevented by your browser from, for example, submitting
     blank fields.
 
-    .. code-block:: html+twig
+    .. code-block:: twig
 
         {# templates/task/new.html.twig #}
         {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
@@ -697,7 +697,7 @@ the choice is ultimately up to you.
         use AppBundle\Form\TaskType;
         use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-        class DefaultController extends AbstractController 
+        class DefaultController extends AbstractController
         {
             public function newAction()
             {

reference/forms/types/options/button_label.rst.inc

@@ -8,7 +8,7 @@ be directly set inside the template:
 
 .. configuration-block::
 
-    .. code-block:: html+twig
+    .. code-block:: twig
 
         {{ form_widget(form.save, { 'label': 'Click me' }) }}
 

templating/escaping.rst

@@ -10,7 +10,7 @@ is that dynamic content could break the HTML of the resulting page or allow
 a malicious user to perform a `Cross Site Scripting`_ (XSS) attack. Consider
 this classic example:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     Hello {{ name }}
 

templating/render_without_controller.rst

@@ -69,7 +69,7 @@ within a template is typically to prepare some data in a custom controller,
 this is probably only useful if you'd like to cache this page partial (see
 :ref:`templating-no-controller-caching`).
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ render(url('acme_privacy')) }}