Merge branch '3.4' into 4.2

* 3.4:
  Added a note about N+1 problem and form collections

Author: javiereguiluz

doctrine/associations.rst

@@ -450,6 +450,8 @@ by adding JOINs.
     all at once (via a *join*), Doctrine will return the *true* ``Category``
     object, since nothing needs to be lazily loaded.
 
+.. _doctrine-associations-join-query:
+
 Joining Related Records
 -----------------------
 

reference/forms/types/entity.rst

@@ -105,6 +105,13 @@ the `query_builder`_ option::
         'choice_label' => 'username',
     ]);
 
+.. note::
+
+    Using form collections may result in making too many database requests to
+    fetch related entities. This is known as the *"N + 1 query problem"* and it
+    can be solved by :ref:`joining related records <doctrine-associations-join-query>`
+    when querying for Doctrine associations.
+
 .. _reference-forms-entity-choices:
 
 Using Choices