Merge branch '2.3' into 2.6

Conflicts:
	components/event_dispatcher/introduction.rst
	cookbook/bundles/best_practices.rst
	reference/forms/types/choice.rst

Author: wouterj

book/doctrine.rst

@@ -1204,7 +1204,8 @@ to the given ``Category`` object via their ``category_id`` value.
         $category = $product->getCategory();
 
         // prints "Proxies\AppBundleEntityCategoryProxy"
-        echo get_class($category);
+        dump(get_class($category));
+        die();
 
     This proxy object extends the true ``Category`` object, and looks and
     acts exactly like it. The difference is that, by using a proxy object,

book/service_container.rst

@@ -276,10 +276,11 @@ The service container is built using a single configuration resource
 be imported from inside this file in one way or another. This gives you absolute
 flexibility over the services in your application.
 
-External service configuration can be imported in two different ways. The
-first - and most common method - is via the ``imports`` directive. Later, you'll
-learn about the second method, which is the flexible and preferred method
-for importing service configuration from third-party bundles.
+External service configuration can be imported in two different ways. The first 
+method, commonly used to import container configuration from the bundles you've 
+created - is via the ``imports`` directive. The second method, although slightly more 
+complex offers more flexibility and is commonly used to import third-party bundle 
+configuration. Read on to learn more about both methods.
 
 .. index::
    single: Service Container; Imports

book/translation.rst

@@ -12,11 +12,13 @@ wrapping each with a function capable of translating the text (or "message")
 into the language of the user::
 
     // text will *always* print out in English
-    echo 'Hello World';
+    dump('Hello World');
+    die();
 
     // text can be translated into the end-user's language or
     // default to English
-    echo $translator->trans('Hello World');
+    dump($translator->trans('Hello World'));
+    die();
 
 .. note::
 

components/class_loader/class_map_generator.rst

@@ -50,7 +50,7 @@ method::
 
     use Symfony\Component\ClassLoader\ClassMapGenerator;
 
-    print_r(ClassMapGenerator::createMap(__DIR__.'/library'));
+    var_dump(ClassMapGenerator::createMap(__DIR__.'/library'));
 
 Given the files and class from the table above, you should see an output like
 this:

components/console/console_arguments.rst

@@ -14,6 +14,7 @@ Have a look at the following command that has three options::
 
     use Symfony\Component\Console\Command\Command;
     use Symfony\Component\Console\Input\InputArgument;
+    use Symfony\Component\Console\Input\InputDefinition;
     use Symfony\Component\Console\Input\InputInterface;
     use Symfony\Component\Console\Input\InputOption;
     use Symfony\Component\Console\Output\OutputInterface;

components/css_selector.rst

@@ -51,7 +51,7 @@ equivalents::
 
     use Symfony\Component\CssSelector\CssSelector;
 
-    print CssSelector::toXPath('div.item > h4 > a');
+    var_dump(CssSelector::toXPath('div.item > h4 > a'));
 
 This gives the following output:
 

components/dependency_injection/advanced.rst

@@ -4,6 +4,8 @@
 Advanced Container Configuration
 ================================
 
+.. _container-private-services:
+
 Marking Services as public / private
 ------------------------------------
 

components/dom_crawler.rst

@@ -47,7 +47,7 @@ traverse easily::
     $crawler = new Crawler($html);
 
     foreach ($crawler as $domElement) {
-        print $domElement->nodeName;
+        var_dump($domElement->nodeName);
     }
 
 Specialized :class:`Symfony\\Component\\DomCrawler\\Link` and

components/event_dispatcher/generic_event.rst

@@ -75,7 +75,7 @@ the event arguments::
     );
     $dispatcher->dispatch('foo', $event);
 
-    echo $event['counter'];
+    var_dump($event['counter']);
 
     class FooListener
     {
@@ -96,7 +96,7 @@ Filtering data::
     $event = new GenericEvent($subject, array('data' => 'Foo'));
     $dispatcher->dispatch('foo', $event);
 
-    echo $event['data'];
+    var_dump($event['data']);
 
     class FooListener
     {
@@ -105,3 +105,4 @@ Filtering data::
             $event['data'] = strtolower($event['data']);
         }
     }
+

components/event_dispatcher/introduction.rst

@@ -638,7 +638,7 @@ dispatched, are passed as arguments to the listener::
     {
         public function myEventListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
         {
-            echo $eventName;
+            // ... do something with the event name
         }
     }