Merge branch '4.4' into 5.0

* 4.4:
  fix doctrine page

Author: javiereguiluz

doctrine.rst

@@ -86,7 +86,7 @@ you need a ``Product`` object to represent those products.
 You can use the ``make:entity`` command to create this class and any fields you
 need. The command will ask you some questions - answer them like done below:
 
-.. code-block:: terminal
+.. code-block:: bash
 
     $ php bin/console make:entity
 
@@ -248,7 +248,7 @@ But what if you need to add a new field property to ``Product``, like a
 ``description``? You can edit the class to add the new property. But, you can
 also use ``make:entity`` again:
 
-.. code-block:: terminal
+.. code-block:: bash
 
     $ php bin/console make:entity