Merge branch '2.0' into 2.1

Conflicts:
	cookbook/doctrine/event_listeners_subscribers.rst

Author: weaverryan

book/doctrine.rst

@@ -421,17 +421,17 @@ of the bundle:
 
 Let's walk through this example:
 
-* **lines 8-11** In this section, you instantiate and work with the ``$product``
+* **lines 9-12** In this section, you instantiate and work with the ``$product``
   object like any other, normal PHP object;
 
-* **line 13** This line fetches Doctrine's *entity manager* object, which is
+* **line 14** This line fetches Doctrine's *entity manager* object, which is
   responsible for handling the process of persisting and fetching objects
   to and from the database;
 
-* **line 14** The ``persist()`` method tells Doctrine to "manage" the ``$product``
+* **line 15** The ``persist()`` method tells Doctrine to "manage" the ``$product``
   object. This does not actually cause a query to be made to the database (yet).
 
-* **line 15** When the ``flush()`` method is called, Doctrine looks through
+* **line 16** When the ``flush()`` method is called, Doctrine looks through
   all of the objects that it's managing to see if they need to be persisted
   to the database. In this example, the ``$product`` object has not been
   persisted yet, so the entity manager executes an ``INSERT`` query and a

components/config/definition.rst

@@ -72,7 +72,7 @@ Add node definitions to the tree
 Variable nodes
 ~~~~~~~~~~~~~~
 
-A tree contains node definitions which can be layed out in a semantic way.
+A tree contains node definitions which can be laid out in a semantic way.
 This means, using indentation and the fluent notation, it is possible to
 reflect the real structure of the configuration values::
 

components/console/usage.rst

@@ -74,7 +74,7 @@ with:
 
 .. code-block:: bash
 
-    $ php app/console list -verbose
+    $ php app/console list --verbose
     $ php app/console list -v
 
 If you set the optional arguments to give your application a name and version::
@@ -85,7 +85,7 @@ then you can use:
 
 .. code-block:: bash
 
-    $ php app/console list -version
+    $ php app/console list --version
     $ php app/console list -V
 
 to get this information output:
@@ -139,5 +139,6 @@ can run it with:
 
     $ php app/console d:g Fabien
 
-If you choose too short a command so it is ambiguous, then no command will be run and
-some suggestions of the possible commands to choose from will be output.
+If you enter a short command that's ambiguous (i.e. there are more than one
+command that match), then no command will be run and some suggestions of
+the possible commands to choose from will be output.

components/dependency_injection/compilation.rst

@@ -6,7 +6,7 @@ Compiling the Container
 
 The service container can be compiled for various reasons. These reasons
 include checking for any potential issues such as circular references and
-making the container more efficient by resolving parameters and removing 
+making the container more efficient by resolving parameters and removing
 unused services.
 
 It is compiled by running::
@@ -170,7 +170,7 @@ the XML configuration::
         return 'http://www.example.com/symfony/schema/';
     }
 
-..note::
+.. note::
 
     XSD validation is optional, returning ``false`` from the ``getXsdValidationBasePath``
     method will disable it.
@@ -192,7 +192,7 @@ The XML version of the config would then look like this:
 
     </container>
 
-..note::
+.. note::
 
     In the Symfony2 full stack framework there is a base Extension class which
     implements these methods as well as a shortcut method for processing the
@@ -275,6 +275,12 @@ will then be called when the container is compiled::
     $container = new ContainerBuilder();
     $container->addCompilerPass(new CustomCompilerPass);
 
+.. note::
+
+    Compiler passes are registered differently is you are using the full
+    stack framework, see :doc:`cookbook/service_container/compiler_passes`
+    for more details.
+
 Controlling the Pass Ordering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -371,7 +377,7 @@ but getting an up to date configuration whilst developing your application::
         // ...
         $container->compile();
 
-        if(!$isDebug) 
+        if (!$isDebug) {
             $dumper = new PhpDumper($container);
             file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
         }
@@ -418,3 +424,8 @@ constructor argument. When the cache is not in debug mode the cached container
 will always be used if it exists. In debug mode, an additional metadata file
 is written with the timestamps of all the resource files. These are then checked
 to see if the files have changed, if they have the cache will be considered stale.
+
+.. note::
+
+    In the full stack framework the compilation and caching of the container
+    is taken care of for you.

components/dependency_injection/parentservices.rst

@@ -236,6 +236,7 @@ a parent for a service.
     .. code-block:: php
 
         use Symfony\Component\DependencyInjection\Definition;
+        use Symfony\Component\DependencyInjection\DefinitionDecorator;
         use Symfony\Component\DependencyInjection\Reference;
 
         // ...
@@ -284,6 +285,12 @@ can only be used as a parent service and cannot be used directly as a service
 to inject and will be removed at compile time. In other words, it exists merely
 as a "template" that other services can use.
 
+.. note::
+
+   In order for parent dependencies to resolve, the ``ContainerBuilder`` must 
+   first be compiled. See :doc:`/components/dependency_injection/compilation` 
+   for more details.
+
 Overriding Parent Dependencies
 ------------------------------
 
@@ -364,6 +371,7 @@ to the ``NewsletterManager`` class, the config would look like this:
     .. code-block:: php
 
         use Symfony\Component\DependencyInjection\Definition;
+        use Symfony\Component\DependencyInjection\DefinitionDecorator;
         use Symfony\Component\DependencyInjection\Reference;
 
         // ...
@@ -482,6 +490,7 @@ If you had the following config:
     .. code-block:: php
 
         use Symfony\Component\DependencyInjection\Definition;
+        use Symfony\Component\DependencyInjection\DefinitionDecorator;
         use Symfony\Component\DependencyInjection\Reference;
 
         // ...

components/dependency_injection/tags.rst

@@ -158,10 +158,16 @@ run when the container is compiled::
     $container = new ContainerBuilder();
     $container->addCompilerPass(new TransportCompilerPass);
 
+.. note::
+
+    Compiler passes are registered differently is you are using the full
+    stack framework, see :doc:`cookbook/service_container/compiler_passes`
+    for more details.
+
 Adding additional attributes on Tags
 ------------------------------------
 
-Sometimes you need additional information about each service that's tagged with your tag. 
+Sometimes you need additional information about each service that's tagged with your tag.
 For example, you might want to add an alias to each TransportChain.
 
 To begin with, change the ``TransportChain`` class::
@@ -212,7 +218,7 @@ To answer this, change the service declaration:
                 class: \Swift_SendmailTransport
                 tags:
                     -  { name: acme_mailer.transport, alias: bar }
-        
+
 
     .. code-block:: xml
 
@@ -224,7 +230,7 @@ To answer this, change the service declaration:
         <service id="acme_mailer.transport.sendmail" class="\Swift_SendmailTransport">
             <tag name="acme_mailer.transport" alias="bar" />
         </service>
-        
+
 Notice that you've added a generic ``alias`` key to the tag. To actually
 use this, update the compiler::
 

cookbook/bundles/extension.rst

@@ -478,9 +478,9 @@ configuration arrays together.
 
 The ``Configuration`` class can be much more complicated than shown here,
 supporting array nodes, "prototype" nodes, advanced validation, XML-specific
-normalization and advanced merging. The best way to see this in action is
-to checkout out some of the core Configuration classes, such as the one from
-the `FrameworkBundle Configuration`_ or the `TwigBundle Configuration`_.
+normalization and advanced merging. You can read more about this in :doc:`the Config Component documentation</components/config/definition>`.
+You can also see it action by checking out some of the core Configuration classes,
+such as the one from the `FrameworkBundle Configuration`_ or the `TwigBundle Configuration`_.
 
 Default Configuration Dump
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

cookbook/doctrine/event_listeners_subscribers.rst

@@ -3,8 +3,8 @@
 
 .. _doctrine-event-config:
 
-Registering Event Listeners and Subscribers
-===========================================
+How to Register Event Listeners and Subscribers
+===============================================
 
 Doctrine packages a rich event system that fires events when almost anything
 happens inside the system. For you, this means that you can create arbitrary
@@ -114,4 +114,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost``
 entity), you should check for the class name of the entity in your method
 (as shown above).
 
-.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
+.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html

cookbook/event_dispatcher/before_after_filters.rst

@@ -155,15 +155,15 @@ your listener to be called just before any controller is executed.
         # app/config/config.yml (or inside your services.yml)
         services:
             demo.tokens.action_listener:
-                class: Acme\DemoBundle\EventListener\BeforeAndAfterListener
+                class: Acme\DemoBundle\EventListener\TokenListener
                 arguments: [ %tokens% ]
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
     .. code-block:: xml
 
         <!-- app/config/config.xml (or inside your services.xml) -->
-        <service id="demo.tokens.action_listener" class="Acme\DemoBundle\EventListener\BeforeAndAfterListener">
+        <service id="demo.tokens.action_listener" class="Acme\DemoBundle\EventListener\TokenListener">
             <argument>%tokens%</argument>
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
         </service>
@@ -173,7 +173,7 @@ your listener to be called just before any controller is executed.
         // app/config/config.php (or inside your services.php)
         use Symfony\Component\DependencyInjection\Definition;
 
-        $listener = new Definition('Acme\DemoBundle\EventListener\BeforeAndAfterListener', array('%tokens%'));
+        $listener = new Definition('Acme\DemoBundle\EventListener\TokenListener', array('%tokens%'));
         $listener->addTag('kernel.event_listener', array('event' => 'kernel.controller', 'method' => 'onKernelController'));
         $container->setDefinition('demo.tokens.action_listener', $listener);
 
@@ -211,7 +211,7 @@ serve as a basic flag that this request underwent token authentication::
             }
 
             // mark the request as having passed token authentication
-            $$event->getRequest()->attributes->set('auth_token', $token);
+            $event->getRequest()->attributes->set('auth_token', $token);
         }
     }
 
@@ -247,7 +247,7 @@ event:
         # app/config/config.yml (or inside your services.yml)
         services:
             demo.tokens.action_listener:
-                class: Acme\DemoBundle\EventListener\BeforeAndAfterListener
+                class: Acme\DemoBundle\EventListener\TokenListener
                 arguments: [ %tokens% ]
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
@@ -256,7 +256,7 @@ event:
     .. code-block:: xml
 
         <!-- app/config/config.xml (or inside your services.xml) -->
-        <service id="demo.tokens.action_listener" class="Acme\DemoBundle\EventListener\BeforeAndAfterListener">
+        <service id="demo.tokens.action_listener" class="Acme\DemoBundle\EventListener\TokenListener">
             <argument>%tokens%</argument>
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
@@ -267,7 +267,7 @@ event:
         // app/config/config.php (or inside your services.php)
         use Symfony\Component\DependencyInjection\Definition;
 
-        $listener = new Definition('Acme\DemoBundle\EventListener\BeforeAndAfterListener', array('%tokens%'));
+        $listener = new Definition('Acme\DemoBundle\EventListener\TokenListener', array('%tokens%'));
         $listener->addTag('kernel.event_listener', array('event' => 'kernel.controller', 'method' => 'onKernelController'));
         $listener->addTag('kernel.event_listener', array('event' => 'kernel.response', 'method' => 'onKernelResponse'));
         $container->setDefinition('demo.tokens.action_listener', $listener);

cookbook/routing/method_parameters.rst

@@ -1,8 +1,8 @@
 .. index::
    single: Routing; _method
 
-Using HTTP Methods beyond GET and POST in Routes
-================================================
+How to use HTTP Methods beyond GET and POST in Routes
+=====================================================
 
 The HTTP method of a request is one of the requirements that can be checked
 when seeing if it matches a route. This is introduced in the routing chapter
@@ -111,4 +111,4 @@ Likewise the delete form could be changed to look like this:
         <input type="submit" value="Delete" />
     </form>
 
-It will then match the ``blog_delete`` route.
+It will then match the ``blog_delete`` route.

cookbook/workflow/new_project_git.rst

@@ -116,8 +116,8 @@ manage this is `Gitolite`_.
 .. _`git`: http://git-scm.com/
 .. _`Symfony2 Standard Edition`: http://symfony.com/download
 .. _`Standard Edition Readme`: https://github.com/symfony/symfony-standard/blob/master/README.md
-.. _`git submodules`: http://book.git-scm.com/5_submodules.html
+.. _`git submodules`: http://git-scm.com/book/en/Git-Tools-Submodules
 .. _`GitHub`: https://github.com/
-.. _`barebones repository`: http://progit.org/book/ch4-4.html
+.. _`barebones repository`: http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository
 .. _`Gitolite`: https://github.com/sitaramc/gitolite
 .. _`Github .gitignore`: http://help.github.com/ignore-files/

reference/forms/types/file.rst

@@ -14,7 +14,7 @@ The ``file`` type represents a file input in your form.
 |             | - `read_only`_                                                      |
 |             | - `error_bubbling`_                                                 |
 +-------------+---------------------------------------------------------------------+
-| Parent type | :doc:`form</reference/forms/types/field>`                           |
+| Parent type | :doc:`form</reference/forms/types/form>`                           |
 +-------------+---------------------------------------------------------------------+
 | Class       | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FileType`  |
 +-------------+---------------------------------------------------------------------+