Merge branch '3.4' into 4.2

* 3.4:
  use :: instead of .. code-block:: php

Author: javiereguiluz

reference/forms/types/collection.rst

@@ -371,9 +371,7 @@ prototype_data
 
 Allows you to define specific data for the prototype. Each new row added will
 initially contain the data set by this option. By default, the data configured
-for all entries with the `entry_options`_ option will be used.
-
-.. code-block:: php
+for all entries with the `entry_options`_ option will be used::
 
     use Symfony\Component\Form\Extension\Core\Type\CollectionType;
     use Symfony\Component\Form\Extension\Core\Type\TextType;