Merge pull request symfony#2601 from WouterJ/update_override_docs

weaverryan · weaverryan · commit 2f9151b6bb51 · 2013-05-15T20:07:09.000-07:00
Update override article
diff --git a/cookbook/bundles/inheritance.rst b/cookbook/bundles/inheritance.rst
@@ -97,12 +97,9 @@ The same goes for routing files, validation configuration and other resources.
 
 .. caution::
 
-   Translation files do not work in the same way as described above. All
-   translation files are accumulated into a set of "pools" (one for each)
-   domain. Symfony loads translation files from bundles first (in the order
-   that the bundles are initialized) and then from your ``app/Resources``
-   directory. If the same translation is specified in two resources, the
-   translation from the resource that's loaded last will win.
+   Translation files do not work in the same way as described above. Read
+   :ref:`override-translations` if you want to learn how to override
+   translations.
 
 .. _`FOSUserBundle`: https://github.com/friendsofsymfony/fosuserbundle
 
diff --git a/cookbook/bundles/override.rst b/cookbook/bundles/override.rst
@@ -11,6 +11,7 @@ Templates
 ---------
 
 For information on overriding templates, see
+
 * :ref:`overriding-bundle-templates`.
 * :doc:`/cookbook/bundles/inheritance`
 
@@ -31,6 +32,7 @@ Controllers
 Assuming the third-party bundle involved uses non-service controllers (which
 is almost always the case), you can easily override controllers via bundle
 inheritance. For more information, see :doc:`/cookbook/bundles/inheritance`.
+If the controller is a service, see the next section on how to override it.
 
 Services & Configuration
 ------------------------
@@ -94,7 +96,11 @@ like adding a method call - you can only use the compiler pass method.
 Entities & Entity mapping
 -------------------------
 
-In progress...
+Due to the way Doctrine works, it is not possible to override entity mapping
+of a bundle. However, if a bundle provides a mapped superclass (such as the
+``User`` entity in the FOSUserBundle) one can override attributes and
+associations. Learn more about this feature and its limitations in
+`the Doctrine documentation`_.
 
 Forms
 -----
@@ -116,7 +122,22 @@ Validation metadata
 
 In progress...
 
+.. _override-translations:
+
 Translations
 ------------
 
-In progress...
+Translations are not related to bundles, but to domains. That means that you
+can override the translations from any translation file, as long as it is in
+:ref:`the correct domain <translation-domains>`.
+
+.. caution::
+
+    The last translation file always wins. That mean that you need to make
+    sure to load the class which overrides the translation of another bundle
+    before that bundle in the ``AppKernel``.
+
+    The file that always wins is the one that is placed in
+    ``app/Resources/translations``, as those files are always loaded as last.
+
+.. _`the Doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/inheritance-mapping.html#overrides
