Merge branch '2.0'

Conflicts:
	book/routing.rst
	cookbook/form/create_custom_field_type.rst
	cookbook/form/form_collections.rst

Author: weaverryan

book/controller.rst

@@ -94,8 +94,8 @@ a controller object. Controllers are also called *actions*.
     :linenos:
 
     // src/Acme/HelloBundle/Controller/HelloController.php
-
     namespace Acme\HelloBundle\Controller;
+
     use Symfony\Component\HttpFoundation\Response;
 
     class HelloController
@@ -208,8 +208,8 @@ passed to that method:
 
     <?php
     // src/Acme/HelloBundle/Controller/HelloController.php
-
     namespace Acme\HelloBundle\Controller;
+
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
     class HelloController extends Controller
@@ -349,8 +349,8 @@ Add the ``use`` statement atop the ``Controller`` class and then modify the
 .. code-block:: php
 
     // src/Acme/HelloBundle/Controller/HelloController.php
-
     namespace Acme\HelloBundle\Controller;
+
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Response;
 

book/doctrine.rst

@@ -93,7 +93,7 @@ Without even thinking about Doctrine or databases, you already know that
 you need a ``Product`` object to represent those products. Create this class
 inside the ``Entity`` directory of your ``AcmeStoreBundle``::
 
-    // src/Acme/StoreBundle/Entity/Product.php    
+    // src/Acme/StoreBundle/Entity/Product.php
     namespace Acme\StoreBundle\Entity;
 
     class Product
@@ -369,7 +369,7 @@ of the bundle:
     use Acme\StoreBundle\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
     // ...
-    
+
     public function createAction()
     {
         $product = new Product();
@@ -1058,7 +1058,7 @@ can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
     // src/Acme/StoreBundle/Repository/ProductRepository.php
-    
+
     public function findOneByIdJoinedToCategory($id)
     {
         $query = $this->getManager()
@@ -1067,7 +1067,7 @@ following method to the ``ProductRepository`` class::
                 JOIN p.category c
                 WHERE p.id = :id'
             )->setParameter('id', $id);
-        
+
         try {
             return $query->getSingleResult();
         } catch (\Doctrine\ORM\NoResultException $e) {

book/forms.rst

@@ -798,7 +798,6 @@ that will house the logic for building the task form:
 .. code-block:: php
 
     // src/Acme/TaskBundle/Form/Type/TaskType.php
-
     namespace Acme\TaskBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;

book/from_flat_php_to_symfony2.rst

@@ -543,8 +543,8 @@ them for you. Here's the same sample application, now built in Symfony2:
 
     <?php
     // src/Acme/BlogBundle/Controller/BlogController.php
-
     namespace Acme\BlogBundle\Controller;
+
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
     class BlogController extends Controller

book/page_creation.rst

@@ -48,7 +48,7 @@ greeted. To create the page, follow the simple two-step process.
     ``web`` directory of your new Symfony2 project. For detailed information
     on this process, see the documentation on the web server you are using.
     Here's the relevant documentation page for some web server you might be using:
-    
+
     * For Apache HTTP Server, refer to `Apache's DirectoryIndex documentation`_.
     * For Nginx, refer to `Nginx HttpCoreModule location documentation`_.
 
@@ -209,8 +209,6 @@ inside your ``AcmeHelloBundle``::
     // src/Acme/HelloBundle/Controller/HelloController.php
     namespace Acme\HelloBundle\Controller;
 
-    use Symfony\Component\HttpFoundation\Response;
-
     class HelloController
     {
     }
@@ -225,8 +223,10 @@ Create the ``indexAction`` method that Symfony will execute when the ``hello``
 route is matched::
 
     // src/Acme/HelloBundle/Controller/HelloController.php
+    namespace Acme\HelloBundle\Controller;
+
+    use Symfony\Component\HttpFoundation\Response;
 
-    // ...
     class HelloController
     {
         public function indexAction($name)

book/routing.rst

@@ -80,8 +80,8 @@ pattern that points to a specific PHP class and method:
 .. code-block:: php
 
     // src/Acme/BlogBundle/Controller/BlogController.php
-
     namespace Acme\BlogBundle\Controller;
+
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
     class BlogController extends Controller
@@ -824,8 +824,8 @@ The controller might look like this:
 .. code-block:: php
 
     // src/Acme/BlogBundle/Controller/BlogController.php
-
     namespace Acme\BlogBundle\Controller;
+
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
     class BlogController extends Controller

book/service_container.rst

@@ -874,142 +874,10 @@ the framework.
     the ``swiftmailer`` key invokes the service extension from the
     ``SwiftmailerBundle``, which registers the ``mailer`` service.
 
-.. index::
-   single: Service Container; Advanced configuration
-
-Advanced Container Configuration
---------------------------------
-
-As we've seen, defining services inside the container is easy, generally
-involving a ``service`` configuration key and a few parameters. However,
-the container has several other tools available that help to *tag* services
-for special functionality, create more complex services, and perform operations
-after the container is built.
-
-Marking Services as public / private
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When defining services, you'll usually want to be able to access these definitions
-within your application code. These services are called ``public``. For example,
-the ``doctrine`` service registered with the container when using the DoctrineBundle
-is a public service as you can access it via::
-
-   $doctrine = $container->get('doctrine');
-
-However, there are use-cases when you don't want a service to be public. This
-is common when a service is only defined because it could be used as an
-argument for another service.
-
-.. note::
-
-    If you use a private service as an argument to more than one other service,
-    this will result in two different instances being used as the instantiation
-    of the private service is done inline (e.g. ``new PrivateFooBar()``).
-
-Simply said: A service will be private when you do not want to access it
-directly from your code.
-
-Here is an example:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        services:
-           foo:
-             class: Acme\HelloBundle\Foo
-             public: false
-
-    .. code-block:: xml
-
-        <service id="foo" class="Acme\HelloBundle\Foo" public="false" />
-
-    .. code-block:: php
-
-        $definition = new Definition('Acme\HelloBundle\Foo');
-        $definition->setPublic(false);
-        $container->setDefinition('foo', $definition);
-
-Now that the service is private, you *cannot* call::
-
-    $container->get('foo');
-
-However, if a service has been marked as private, you can still alias it (see
-below) to access this service (via the alias).
-
-.. note::
-
-   Services are by default public.
-
-Aliasing
-~~~~~~~~
-
-When using core or third party bundles within your application, you may want
-to use shortcuts to access some services. You can do so by aliasing them and,
-furthermore, you can even alias non-public services.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        services:
-           foo:
-             class: Acme\HelloBundle\Foo
-           bar:
-             alias: foo
-
-    .. code-block:: xml
-
-        <service id="foo" class="Acme\HelloBundle\Foo"/>
-
-        <service id="bar" alias="foo" />
-
-    .. code-block:: php
-
-        $definition = new Definition('Acme\HelloBundle\Foo');
-        $container->setDefinition('foo', $definition);
-
-        $containerBuilder->setAlias('bar', 'foo');
-
-This means that when using the container directly, you can access the ``foo``
-service by asking for the ``bar`` service like this::
-
-    $container->get('bar'); // Would return the foo service
-
-Requiring files
-~~~~~~~~~~~~~~~
-
-There might be use cases when you need to include another file just before
-the service itself gets loaded. To do so, you can use the ``file`` directive.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        services:
-           foo:
-             class: Acme\HelloBundle\Foo\Bar
-             file: %kernel.root_dir%/src/path/to/file/foo.php
-
-    .. code-block:: xml
-
-        <service id="foo" class="Acme\HelloBundle\Foo\Bar">
-            <file>%kernel.root_dir%/src/path/to/file/foo.php</file>
-        </service>
-
-    .. code-block:: php
-
-        $definition = new Definition('Acme\HelloBundle\Foo\Bar');
-        $definition->setFile('%kernel.root_dir%/src/path/to/file/foo.php');
-        $container->setDefinition('foo', $definition);
-
-Notice that symfony will internally call the PHP function require_once
-which means that your file will be included only once per request.
-
 .. _book-service-container-tags:
 
 Tags (``tags``)
-~~~~~~~~~~~~~~~
+---------------
 
 In the same way that a blog post on the Web might be tagged with things such
 as "Symfony" or "PHP", services configured in your container can also be
@@ -1077,5 +945,6 @@ Learn more
 * :doc:`/cookbook/controller/service`
 * :doc:`/cookbook/service_container/scopes`
 * :doc:`/cookbook/service_container/compiler_passes`
+* :doc:`/components/dependency_injection/advanced`
 
 .. _`service-oriented architecture`: http://wikipedia.org/wiki/Service-oriented_architecture

book/testing.rst

@@ -53,7 +53,7 @@ called ``Calculator`` in the ``Utility/`` directory of your bundle::
 
     // src/Acme/DemoBundle/Utility/Calculator.php
     namespace Acme\DemoBundle\Utility;
-    
+
     class Calculator
     {
         public function add($a, $b)