Merge branch '5.1'

* 5.1:
  Minor tweak
  Update best_practices.rst
  Remove paragraph about mapping override

Author: javiereguiluz

best_practices.rst

@@ -52,7 +52,8 @@ self-explanatory and not coupled to Symfony:
     ├─ config/
     │  ├─ packages/
     │  └─ services.yaml
-    └─ public/
+    ├─ migrations/
+    ├─ public/
     │  ├─ build/
     │  └─ index.php
     ├─ src/
@@ -63,7 +64,6 @@ self-explanatory and not coupled to Symfony:
     │  ├─ Entity/
     │  ├─ EventSubscriber/
     │  ├─ Form/
-    │  ├─ Migrations/
     │  ├─ Repository/
     │  ├─ Security/
     │  └─ Twig/

bundles/override.rst

@@ -92,14 +92,10 @@ inside a :doc:`compiler pass </service_container/compiler_passes>`.
 Entities & Entity Mapping
 -------------------------
 
-If a bundle defines its entity mapping in configuration files instead of
-annotations, you can override them as any other regular bundle configuration
-file. The only caveat is that you must override all those mapping configuration
-files and not just the ones you actually want to override.
-
-If a bundle provides a mapped superclass (such as the ``User`` entity in the
-FOSUserBundle) you can override its attributes and associations. Learn more
-about this feature and its limitations in `the Doctrine documentation`_.
+Overriding entity mapping is only possible if a bundle provides a mapped
+superclass (such as the ``User`` entity in the FOSUserBundle). It's possible to
+override attributes and associations in this way. Learn more about this feature
+and its limitations in `the Doctrine documentation`_.
 
 Forms
 -----