Merge branch '4.2'

* 4.2:
  use html+twig instead of twig for some examples

Author: javiereguiluz

doctrine/registration_form.rst

@@ -185,7 +185,7 @@ register.html.twig
 
 The template renders the form:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {% extends 'base.html.twig' %}
 

form/form_customization.rst

@@ -339,7 +339,7 @@ This test will check if the current choice is equal to the ``selected_value``
 or if the current choice is in the array (when ``selected_value`` is an
 array).
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <option {% if choice is selectedchoice(value) %}selected="selected"{% endif %} ...>
 

quick_tour/flex_recipes.rst

@@ -100,7 +100,7 @@ Thanks to Flex, after one command, you can start using Twig immediately:
 By extending ``AbstractController``, you now have access to a number of shortcut
 methods and tools, like ``render()``. Create the new template:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {# templates/default/index.html.twig #}
     <h1>Hello {{ name }}</h1>
@@ -112,7 +112,7 @@ its syntax and power later.
 But, right now, the page *only* contains the ``h1`` tag. To give it an HTML layout,
 extend ``base.html.twig``:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {# templates/default/index.html.twig #}
     {% extends 'base.html.twig' %}

quick_tour/the_architecture.rst

@@ -200,7 +200,7 @@ that extends ``AbstractExtension``::
 
 After creating just *one* file, you can use this immediately:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {# templates/default/index.html.twig #}
     {# Will print something like "Hey Symfony!" #}

security/csrf.rst

@@ -137,7 +137,7 @@ Consider a simple HTML form created to allow deleting items. First, use the
 :ref:`csrf_token() Twig function <reference-twig-function-csrf-token>` to
 generate a CSRF token in the template and store it as a hidden form field:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <form action="{{ url('admin_post_delete', { id: post.id }) }}" method="post">
         {# the argument of csrf_token() is an arbitrary string used to generate the token #}

security/form_login_setup.rst

@@ -122,7 +122,7 @@ Edit the ``security.yml`` file in order to allow access for anyone to the
 **Step 2.** The template has very little to do with security: it just generates
 a traditional HTML form that submits to ``/login``:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {% extends 'base.html.twig' %}