Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit c895d644709b · 2013-05-15T22:25:59.000-05:00
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -163,7 +163,7 @@ The crawler supports multiple ways of adding the content::
 .. note::
 
     When dealing with character sets other than ISO-8859-1, always add HTML
-    content using the :method:`Symfony\\Component\\DomCrawler\\Crawler::addHTMLContent``
+    content using the :method:`Symfony\\Component\\DomCrawler\\Crawler::addHTMLContent`
     method where you can specify the second parameter to be your target character
     set.
 
diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst
@@ -143,7 +143,7 @@ You can see an example in the previous section.
 .. caution::
 
     When using the ``cssrewrite`` filter, don't refer to your CSS files using
-    the ``@AcmeFooBundle``. See the note in the above section for details.
+    the ``@AcmeFooBundle`` syntax. See the note in the above section for details.
 
 Combining Assets
 ~~~~~~~~~~~~~~~~
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 that the bundle containing *your* translations is loaded after any
+    bundle whose translations you're overriding. This is done in ``AppKernel``.
+
+    The file that always wins is the one that is placed in
+    ``app/Resources/translations``, as those files are always loaded last.
+
+.. _`the Doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/inheritance-mapping.html#overrides
diff --git a/cookbook/form/data_transformers.rst b/cookbook/form/data_transformers.rst
@@ -342,7 +342,7 @@ it's quite easy::
         {
             $builder
                 ->add('task')
-                ->add('dueDate', null, array('widget' => 'single_text'));
+                ->add('dueDate', null, array('widget' => 'single_text'))
                 ->add('issue', 'issue_selector');
         }
 
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
@@ -236,7 +236,7 @@ not to the property:
         # src/Acme/BlogBundle/Resources/config/validation.yml
         Acme\DemoBundle\Entity\AcmeEntity:
             constraints:
-                Acme\DemoBundle\Validator\Constraints\ContainsAlphanumeric: ~
+                - Acme\DemoBundle\Validator\Constraints\ContainsAlphanumeric: ~
 
     .. code-block:: php-annotations
 
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -238,15 +238,15 @@ For details on creating your own custom data collection, read the cookbook
 article: :doc:`/cookbook/profiler/data_collector`.
 
 doctrine.event_listener
---------------
+-----------------------
 
 **Purpose**: Add a Doctrine event listener
 
 For details on creating Doctrine event listeners, read the cookbook article:
 :doc:`/cookbook/doctrine/event_listeners_subscribers`.
 
 doctrine.event_subscriber
---------------
+-------------------------
 
 **Purpose**: Add a Doctrine event subscriber
 

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ it's quite easy::`
`342`	`342`	`{`
`343`	`343`	`$builder`
`344`	`344`	`->add('task')`
`345`		`- ->add('dueDate', null, array('widget' => 'single_text'));`
	`345`	`+ ->add('dueDate', null, array('widget' => 'single_text'))`
`346`	`346`	`->add('issue', 'issue_selector');`
`347`	`347`	`}`
`348`	`348`