Merge branch '3.4' into 4.2

* 3.4:
  use correct code-block type

Author: OskarStark

page_creation.rst

@@ -240,7 +240,7 @@ Template files live in the ``templates/`` directory, which was created for you a
 when you installed Twig. Create a new ``templates/lucky`` directory with a new
 ``number.html.twig`` file inside:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {# templates/lucky/number.html.twig #}