diff --git a/book/forms.rst b/book/forms.rst
index cc41e14efdd..eac7c02f946 100644
--- a/book/forms.rst
+++ b/book/forms.rst
@@ -48,6 +48,7 @@ going to need to build a form. But before you begin, first focus on the generic
         {
             return $this->dueDate;
         }
+        
         public function setDueDate(\DateTime $dueDate = null)
         {
             $this->dueDate = $dueDate;
diff --git a/book/http_cache.rst b/book/http_cache.rst
index eae2857dc9f..c13ba53db0b 100644
--- a/book/http_cache.rst
+++ b/book/http_cache.rst
@@ -795,13 +795,13 @@ Gateway caches are a great way to make your website perform better. But they
 have one limitation: they can only cache whole pages. If you can't cache
 whole pages or if parts of a page has "more" dynamic parts, you are out of
 luck. Fortunately, Symfony2 provides a solution for these cases, based on a
-technology called `ESI`_, or Edge Side Includes. Akamaï wrote this specification
+technology called `ESI`_, or Edge Side Includes. Akamai wrote this specification
 almost 10 years ago, and it allows specific parts of a page to have a different
 caching strategy than the main page.
 
 The ESI specification describes tags you can embed in your pages to communicate
 with the gateway cache. Only one tag is implemented in Symfony2, ``include``,
-as this is the only useful one outside of Akamaï context:
+as this is the only useful one outside of Akamai context:
 
 .. code-block:: html
 
@@ -936,7 +936,7 @@ used ``render``.
 
 .. note::
 
-    Symfony2 detects if a gateway cache supports ESI via another Akamaï
+    Symfony2 detects if a gateway cache supports ESI via another Akamai
     specification that is supported out of the box by the Symfony2 reverse
     proxy.
 
diff --git a/book/includes/_service_container_my_mailer.rst.inc b/book/includes/_service_container_my_mailer.rst.inc
index efc2eaeac26..675df06f375 100644
--- a/book/includes/_service_container_my_mailer.rst.inc
+++ b/book/includes/_service_container_my_mailer.rst.inc
@@ -16,8 +16,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd"
-            >
-
+        >
             <services>
                 <service id="my_mailer" class="Acme\HelloBundle\Mailer">
                     <argument>sendmail</argument>
@@ -33,4 +32,4 @@
         $container->setDefinition('my_mailer', new Definition(
             'Acme\HelloBundle\Mailer',
             array('sendmail')
-        ));
\ No newline at end of file
+        ));
diff --git a/book/security.rst b/book/security.rst
index 391856bb3ae..12a98e7bd1f 100644
--- a/book/security.rst
+++ b/book/security.rst
@@ -764,13 +764,13 @@ is used to enforce access.
 Each ``access_control`` has several options that configure two different
 things:
 
-* (a) :ref:`should the incoming request match this access control entry <security-book-access-control-matching-options>`
-* (b) :ref:`once it matches, should some sort of access restriction be enforced <security-book-access-control-enforcement-options>`:
+#. :ref:`should the incoming request match this access control entry <security-book-access-control-matching-options>`
+#. :ref:`once it matches, should some sort of access restriction be enforced <security-book-access-control-enforcement-options>`:
 
 .. _security-book-access-control-matching-options:
 
-(a) Matching Options
-....................
+1. Matching Options
+...................
 
 Symfony2 creates an instance of :class:`Symfony\\Component\\HttpFoundation\\RequestMatcher`
 for each ``access_control`` entry, which determines whether or not a given
@@ -865,8 +865,8 @@ will match any ``ip``, ``host`` or ``method``:
 
 .. _security-book-access-control-enforcement-options:
 
-(b) Access Enforcement
-......................
+2. Access Enforcement
+.....................
 
 Once Symfony2 has decided which ``access_control`` entry matches (if any),
 it then *enforces* access restrictions based on the ``roles`` and ``requires_channel``
diff --git a/book/service_container.rst b/book/service_container.rst
index 3dc5698c853..414c819cd8b 100644
--- a/book/service_container.rst
+++ b/book/service_container.rst
@@ -103,7 +103,7 @@ for you. In order for this to work, you must *teach* the container how to
 create the ``Mailer`` service. This is done via configuration, which can
 be specified in YAML, XML or PHP:
 
-.. include includes/_service_container_my_mailer.rst.inc
+.. include:: includes/_service_container_my_mailer.rst.inc
 
 .. note::
 
@@ -643,7 +643,7 @@ which has a ``getMailerMethod()`` method on it, which will return a string
 like ``sendmail`` based on some configuration. Remember that the first argument
 to the ``my_mailer`` service is the simple string ``sendmail``:
 
-.. include includes/_service_container_my_mailer.rst.inc
+.. include:: includes/_service_container_my_mailer.rst.inc
 
 But instead of hardcoding this, how could we get this value from the ``getMailerMethod()``
 of the new ``mailer_configuration`` service? One way is to use an expression:
@@ -874,7 +874,7 @@ Now, just inject the ``request_stack``, which behaves like any normal service:
         # src/Acme/HelloBundle/Resources/config/services.yml
         services:
             newsletter_manager:
-                class:     "Acme\HelloBundle\Newsletter\NewsletterManager"
+                class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 arguments: ["@request_stack"]
 
     .. code-block:: xml
diff --git a/book/translation.rst b/book/translation.rst
index 2c946535284..c27ac70c933 100644
--- a/book/translation.rst
+++ b/book/translation.rst
@@ -392,7 +392,7 @@ key ``Symfony2 is great``. To find the French translation, Symfony actually
 checks translation resources for several different locales:
 
 1. First, Symfony looks for the translation in a ``fr_FR`` translation resource
-   (e.g. ``messages.fr_FR.xfliff``);
+   (e.g. ``messages.fr_FR.xliff``);
 
 2. If it wasn't found, Symfony looks for the translation in a ``fr`` translation
    resource (e.g. ``messages.fr.xliff``);
diff --git a/components/config/definition.rst b/components/config/definition.rst
index a6cdc64d9a3..b635ff2a205 100644
--- a/components/config/definition.rst
+++ b/components/config/definition.rst
@@ -390,8 +390,8 @@ process is used to remove some of the differences that result from different
 configuration formats, mainly the differences between YAML and XML.
 
 The separator used in keys is typically ``_`` in YAML and ``-`` in XML. For
-example, ``auto_connect`` in YAML and ``auto-connect``. The normalization would
-make both of these ``auto_connect``.
+example, ``auto_connect`` in YAML and ``auto-connect`` in XML.
+The normalization would make both of these ``auto_connect``.
 
 .. caution::
 
diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst
index 3e46334fab1..e4eec6b3a45 100644
--- a/components/console/helpers/dialoghelper.rst
+++ b/components/console/helpers/dialoghelper.rst
@@ -12,8 +12,8 @@ helper set, which you can get by calling
     $dialog = $this->getHelperSet()->get('dialog');
 
 All the methods inside the Dialog Helper have an
-:class:`Symfony\\Component\\Console\\Output\\OutputInterface` as first the
-argument, the question as the second argument and the default value as last
+:class:`Symfony\\Component\\Console\\Output\\OutputInterface` as the first
+argument, the question as the second argument and the default value as the last
 argument.
 
 Asking the User for confirmation
@@ -52,8 +52,9 @@ if you want to know a bundle name, you can add this to your command::
     );
 
 The user will be asked "Please enter the name of the bundle". They can type
-some name which will be returned by the ``ask`` method. If they leave it empty,
-the default value (``AcmeDemoBundle`` here) is returned.
+some name which will be returned by the
+:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::ask` method.
+If they leave it empty, the default value (``AcmeDemoBundle`` here) is returned.
 
 Autocompletion
 ~~~~~~~~~~~~~~
@@ -222,9 +223,12 @@ this set the seventh argument to ``true``::
         return $colors[$c];
     }, $selected);
 
-    $output->writeln('You have just selected: ' . implode(', ', $selectedColors));
+    $output->writeln(
+        'You have just selected: ' . implode(', ', $selectedColors)
+    );
 
-Now, when the user enters ``1,2``, the result will be: ``You have just selected: blue, yellow``.
+Now, when the user enters ``1,2``, the result will be:
+``You have just selected: blue, yellow``.
 
 Testing a Command which expects input
 -------------------------------------
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
index bb89cb17028..7da8fb6655a 100644
--- a/components/console/introduction.rst
+++ b/components/console/introduction.rst
@@ -233,7 +233,7 @@ method returns without actually printing.
     The MonologBridge provides a :class:`Symfony\\Bridge\\Monolog\\Handler\\ConsoleHandler`
     class that allows you to display messages on the console. This is cleaner
     than wrapping your output calls in conditions. For an example use in
-    the Symfony Framework, see :doc:/cookbook/logging/monolog_console.
+    the Symfony Framework, see :doc:`/cookbook/logging/monolog_console`.
 
 Using Command Arguments
 -----------------------
diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst
index 4265fae224c..ecf83c853b9 100644
--- a/components/dependency_injection/parameters.rst
+++ b/components/dependency_injection/parameters.rst
@@ -295,7 +295,7 @@ keywords (respectively ``true``, ``false`` and ``null``):
 .. code-block:: xml
 
     <parameters>
-        <parameter key="mailer.send_all_in_once">false</parameters>
+        <parameter key="mailer.send_all_in_once">false</parameter>
     </parameters>
 
     <!-- after parsing
diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst
index 16ba0f4ff61..2e96926b365 100644
--- a/components/dependency_injection/tags.rst
+++ b/components/dependency_injection/tags.rst
@@ -199,9 +199,6 @@ To begin with, change the ``TransportChain`` class::
             if (array_key_exists($alias, $this->transports)) {
                return $this->transports[$alias];
             }
-            else {
-               return;
-            }
         }
     }
 
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
index 690f0de90e0..6a3a6b70ce1 100644
--- a/components/dom_crawler.rst
+++ b/components/dom_crawler.rst
@@ -55,11 +55,11 @@ interacting with html links and forms as you traverse through the HTML tree.
 .. note::
 
     The DomCrawler will attempt to automatically fix your HTML to match the
-    official specification. For example, if you nest a `` <p>`` tag inside
-    another `` <p>`` tag, it will be moved to be a sibling of the parent tag.
+    official specification. For example, if you nest a ``<p>`` tag inside
+    another ``<p>`` tag, it will be moved to be a sibling of the parent tag.
     This is expected and is part of the HTML5 spec. But if you're getting
     unexpected behavior, this could be a cause. And while the DomCrawler
-    isn't meant to dump content, you can see the "fixed" version if your HTML
+    isn't meant to dump content, you can see the "fixed" version of your HTML
     by :ref:`dumping it <component-dom-crawler-dumping>`.
 
 Node Filtering
@@ -83,10 +83,12 @@ Anonymous function can be used to filter with more complex criteria::
     use Symfony\Component\DomCrawler\Crawler;
     // ...
 
-    $crawler = $crawler->filter('body > p')->reduce(function (Crawler $node, $i) {
-        // filter even nodes
-        return ($i % 2) == 0;
-    });
+    $crawler = $crawler
+        ->filter('body > p')
+        ->reduce(function (Crawler $node, $i) {
+            // filter even nodes
+            return ($i % 2) == 0;
+        });
 
 To remove a node the anonymous function must return false.
 
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
index 0ea96b89abc..b037c462898 100644
--- a/components/event_dispatcher/introduction.rst
+++ b/components/event_dispatcher/introduction.rst
@@ -441,30 +441,31 @@ which returns a boolean value::
 EventDispatcher aware Events and Listeners
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``EventDispatcher`` always injects a reference to itself in the passed event
-object. This means that all listeners have direct access to the
-``EventDispatcher`` object that notified the listener via the passed ``Event``
-object's :method:`Symfony\\Component\\EventDispatcher\\Event::getDispatcher`
-method.
+.. versionadded:: 2.4
+    Since Symfony 2.4 the current event name and the ``EventDispatcher``
+    itself are passed to the listeners as additional arguments.
 
-This can lead to some advanced applications of the ``EventDispatcher`` including
-letting listeners dispatch other events, event chaining or even lazy loading of
-more listeners into the dispatcher object. Examples follow:
+The ``EventDispatcher`` always passes the dispatched event, the event's name
+and a reference to itself to the listeners. This can be used in some advanced
+usages of the ``EventDispatcher`` like dispatching other events in listeners,
+event chaining or even lazy loading of more listeners into the dispatcher
+object as shown in the following examples.
 
 Lazy loading listeners::
 
     use Symfony\Component\EventDispatcher\Event;
+    use Symfony\Component\EventDispatcher\EventDispatcherInterface;
     use Acme\StoreBundle\Event\StoreSubscriber;
 
     class Foo
     {
         private $started = false;
 
-        public function myLazyListener(Event $event)
+        public function myLazyListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
         {
             if (false === $this->started) {
                 $subscriber = new StoreSubscriber();
-                $event->getDispatcher()->addSubscriber($subscriber);
+                $dispatcher->addSubscriber($subscriber);
             }
 
             $this->started = true;
@@ -476,12 +477,13 @@ Lazy loading listeners::
 Dispatching another event from within a listener::
 
     use Symfony\Component\EventDispatcher\Event;
+    use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
     class Foo
     {
-        public function myFooListener(Event $event)
+        public function myFooListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
         {
-            $event->getDispatcher()->dispatch('log', $event);
+            $dispatcher->dispatch('log', $event);
 
             // ... more code
         }
diff --git a/components/expression_language/caching.rst b/components/expression_language/caching.rst
index 41c9d2a1c26..3ea35752e2f 100644
--- a/components/expression_language/caching.rst
+++ b/components/expression_language/caching.rst
@@ -63,7 +63,9 @@ Both ``evaluate()`` and ``compile()`` can handle ``ParsedExpression`` and
     use Symfony\Component\ExpressionLanguage\SerializedParsedExpression;
     // ...
 
-    $expression = new SerializedParsedExpression(serialize($language->parse('1 + 4')));
+    $expression = new SerializedParsedExpression(
+        serialize($language->parse('1 + 4'))
+    );
 
     echo $language->evaluate($expression); // prints 5
 
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
index 56cfa62d4b1..98cb6fffe09 100644
--- a/components/options_resolver.rst
+++ b/components/options_resolver.rst
@@ -50,17 +50,17 @@ The advantages of doing this will become more obvious as you continue::
         $this->options = $resolver->resolve($options);
     }
 
-The options property now is a well defined array with all resolved options readily available::
+The options property now is a well defined array with all resolved options
+readily available::
 
     // ...
-    public function getHost()
+    public function sendMail($from, $to)
     {
-        return $this->options['host'];
-    }
-
-    public function getPassword()
-    {
-        return $this->options['password'];
+        $mail = ...;
+        $mail->setHost($this->options['host']);
+        $mail->setUsername($this->options['username']);
+        $mail->setPassword($this->options['password']);
+        // ...
     }
 
 Configuring the OptionsResolver
@@ -70,6 +70,7 @@ Now, try to actually use the class::
 
     $mailer = new Mailer(array(
         'host'     => 'smtp.example.org',
+        'username' => 'user',
         'password' => 'pa$$word',
     ));
 
@@ -86,7 +87,7 @@ knows which options should be resolved.
     function.
 
 A best practice is to put the configuration in a method (e.g.
-``setDefaultOptions``). You call this method in the constructor to configure
+``configureOptions``). You call this method in the constructor to configure
 the ``OptionsResolver`` class::
 
     use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -99,17 +100,38 @@ the ``OptionsResolver`` class::
         public function __construct(array $options = array())
         {
             $resolver = new OptionsResolver();
-            $this->setDefaultOptions($resolver);
+            $this->configureOptions($resolver);
 
             $this->options = $resolver->resolve($options);
         }
 
-        protected function setDefaultOptions(OptionsResolverInterface $resolver)
+        protected function configureOptions(OptionsResolverInterface $resolver)
         {
             // ... configure the resolver, you will learn this in the sections below
         }
     }
 
+Set Default Values
+~~~~~~~~~~~~~~~~~~
+
+Most of the options have a default value. You can configure these options by
+calling :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefaults`::
+
+    // ...
+    protected function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        // ...
+
+        $resolver->setDefaults(array(
+            'username' => 'root',
+        ));
+    }
+
+This would add an option - ``username`` - and give it a default value of
+``root``. If the user passes in a ``username`` option, that value will
+override this default. You don't need to configure ``username`` as an optional
+option.
+
 Required Options
 ~~~~~~~~~~~~~~~~
 
@@ -135,15 +157,18 @@ If you don't pass a required option, a
 :class:`Symfony\\Component\\OptionsResolver\\Exception\\MissingOptionsException`
 will be thrown.
 
-To determine if an option is required, you can use the
-:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isRequired`
-method.
+.. tip::
+
+    To determine if an option is required, you can use the
+    :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::isRequired`
+    method.
 
 Optional Options
 ~~~~~~~~~~~~~~~~
 
 Sometimes, an option can be optional (e.g. the ``password`` option in the
-``Mailer`` class). You can configure these options by calling
+``Mailer`` class), but it doesn't have a default value. You can configure
+these options by calling
 :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setOptional`::
 
     // ...
@@ -154,34 +179,23 @@ Sometimes, an option can be optional (e.g. the ``password`` option in the
         $resolver->setOptional(array('password'));
     }
 
-Set Default Values
-~~~~~~~~~~~~~~~~~~
-
-Most of the optional options have a default value. You can configure these
-options by calling
-:method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::setDefaults`::
+Options with defaults are already marked as optional.
 
-    // ...
-    protected function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        // ...
+.. tip::
 
-        $resolver->setDefaults(array(
-            'username' => 'root',
-        ));
-    }
+    When setting an option as optional, you can't be sure if it's in the array
+    or not. You have to check if the option exists before using it.
 
-This would add a third option - ``username`` - and give it a default value
-of ``root``. If the user passes in a ``username`` option, that value will
-override this default. You don't need to configure ``username`` as an optional
-option. The ``OptionsResolver`` already knows that options with a default
-value are optional.
+    To avoid checking if it exists everytime, you can also set a default of
+    ``null`` to an option using the ``setDefaults()`` method (see `Set Default Values`_),
+    this means the element always exists in the array, but with a default of
+    ``null``.
 
-Default Values that depend on another Option
+Default Values that Depend on another Option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Suppose you add a ``port`` option to the ``Mailer`` class, whose default
-value you guess based on the host. You can do that easily by using a
+value you guess based on the encryption. You can do that easily by using a
 closure as the default value::
 
     use Symfony\Component\OptionsResolver\Options;
@@ -193,9 +207,10 @@ closure as the default value::
         // ...
 
         $resolver->setDefaults(array(
+            'encryption' => null,
             'port' => function (Options $options) {
-                if (in_array($options['host'], array('127.0.0.1', 'localhost'))) {
-                    return 80;
+                if ('ssl' === $options['encryption']) {
+                    return 465;
                 }
 
                 return 25;
@@ -203,6 +218,10 @@ closure as the default value::
         ));
     }
 
+The :class:`Symfony\\Component\\OptionsResolver\\Options` class implements
+:phpclass:`ArrayAccess`, :phpclass:`Iterator` and :phpclass:`Countable`. That
+means you can handle it just like a normal array containing the options.
+
 .. caution::
 
     The first argument of the closure must be typehinted as ``Options``,
@@ -296,14 +315,14 @@ a ``transport`` option, it can only be one of ``sendmail``, ``mail`` or
         // ...
 
         $resolver->setAllowedValues(array(
-            'transport' => array('sendmail', 'mail', 'smtp'),
+            'encryption' => array(null, 'ssl', 'tls'),
         ));
     }
 
 There is also an
 :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::addAllowedValues`
 method, which you can use if you want to add an allowed value to the previously
-set allowed values.
+configured allowed values.
 
 .. versionadded:: 2.5
 
@@ -328,7 +347,7 @@ as an allowed value::
 
     Note that using this together with ``addAllowedValues`` will not work.
 
-Configure allowed Types
+Configure Allowed Types
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 You can also specify allowed types. For instance, the ``port`` option can
diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst
index 4c4f7197ea9..8c16204ea0e 100644
--- a/cookbook/assetic/asset_management.rst
+++ b/cookbook/assetic/asset_management.rst
@@ -270,6 +270,79 @@ combine third party assets, such as jQuery, with your own into a single file:
             <script src="<?php echo $view->escape($url) ?>"></script>
         <?php endforeach; ?>
 
+Using Named Assets
+~~~~~~~~~~~~~~~~~~
+
+AsseticBundle configuration directives allow you to define named asset sets.
+You can do so by defining the input files, filters and output files in your
+configuration under the ``assetic`` section. Read more in the
+:doc:`assetic config reference </reference/configuration/assetic>`.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        assetic:
+            assets:
+                jquery_and_ui:
+                    inputs:
+                        - '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js'
+                        - '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js'
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" encoding="UTF-8"?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic">
+
+            <assetic:config>
+                <assetic:asset name="jquery_and_ui">
+                    <assetic:input>@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js</assetic:input>
+                    <assetic:input>@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js</assetic:input>
+                </assetic:asset>
+            </assetic:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('assetic', array(
+            'assets' => array(
+                'jquery_and_ui' => array(
+                    'inputs' => array(
+                        '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js',
+                        '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js',
+                    ),
+                ),
+            ),
+        );
+
+After you have defined the named assets, you can reference them in your templates
+with the ``@named_asset`` notation:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        {% javascripts
+            '@jquery_and_ui'
+            '@AcmeFooBundle/Resources/public/js/*' %}
+            <script src="{{ asset_url }}"></script>
+        {% endjavascripts %}
+
+    .. code-block:: html+php
+
+        <?php foreach ($view['assetic']->javascripts(
+            array(
+                '@jquery_and_ui',
+                '@AcmeFooBundle/Resources/public/js/*',
+            )
+        ) as $url): ?>
+            <script src="<?php echo $view->escape($url) ?>"></script>
+        <?php endforeach; ?>
+
 .. _cookbook-assetic-filters:
 
 Filters
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
index e72612acff6..48eb43c2592 100644
--- a/cookbook/cache/varnish.rst
+++ b/cookbook/cache/varnish.rst
@@ -19,7 +19,7 @@ As seen previously, Symfony2 is smart enough to detect whether it talks to a
 reverse proxy that understands ESI or not. It works out of the box when you
 use the Symfony2 reverse proxy, but you need a special configuration to make
 it work with Varnish. Thankfully, Symfony2 relies on yet another standard
-written by Akamaï (`Edge Architecture`_), so the configuration tips in this
+written by Akamai (`Edge Architecture`_), so the configuration tips in this
 chapter can be useful even if you don't use Symfony2.
 
 .. note::
diff --git a/cookbook/doctrine/registration_form.rst b/cookbook/doctrine/registration_form.rst
index e61f6febbca..b3f6050e41b 100644
--- a/cookbook/doctrine/registration_form.rst
+++ b/cookbook/doctrine/registration_form.rst
@@ -272,7 +272,7 @@ the validation and saves the data into the database::
 
     public function createAction(Request $request)
     {
-        $em = $this->getDoctrine()->getEntityManager();
+        $em = $this->getDoctrine()->getManager();
 
         $form = $this->createForm(new RegistrationType(), new Registration());
 
diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst
index 52e82cc89da..92732d55695 100644
--- a/cookbook/form/form_customization.rst
+++ b/cookbook/form/form_customization.rst
@@ -24,7 +24,7 @@ method:
 
     .. code-block:: php
 
-        <?php echo $view['form']->row($form['age']) }} ?>
+        <?php echo $view['form']->row($form['age']); ?>
 
 You can also render each of the three parts of the field individually:
 
diff --git a/cookbook/security/api_key_authentication.rst b/cookbook/security/api_key_authentication.rst
index 3b9fbe2558f..c412bd234d6 100644
--- a/cookbook/security/api_key_authentication.rst
+++ b/cookbook/security/api_key_authentication.rst
@@ -38,7 +38,7 @@ value and then a User object is created::
     {
         protected $userProvider;
 
-        public function __construct(ApiKeyUserProviderInterface $userProvider)
+        public function __construct(ApiKeyUserProvider $userProvider)
         {
             $this->userProvider = $userProvider;
         }
@@ -59,7 +59,7 @@ value and then a User object is created::
         public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey)
         {
             $apiKey = $token->getCredentials();
-            $username = $this->userProvider->getUsernameForApiKey($apiKey)
+            $username = $this->userProvider->getUsernameForApiKey($apiKey);
 
             if (!$username) {
                 throw new AuthenticationException(
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
index 72a815af54b..382c92aa1d9 100644
--- a/cookbook/templating/PHP.rst
+++ b/cookbook/templating/PHP.rst
@@ -54,7 +54,10 @@ below renders the ``index.html.php`` template::
     // ...
     public function indexAction($name)
     {
-        return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));
+        return $this->render(
+            'AcmeHelloBundle:Hello:index.html.php',
+            array('name' => $name)
+        );
     }
 
 You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
diff --git a/cookbook/templating/namespaced_paths.rst b/cookbook/templating/namespaced_paths.rst
index 97168b74ab5..398ca058b24 100644
--- a/cookbook/templating/namespaced_paths.rst
+++ b/cookbook/templating/namespaced_paths.rst
@@ -77,4 +77,4 @@ called ``sidebar.twig`` in that directory, you can use it easily:
 
 .. code-block:: jinja
 
-    {% include '@foo_bar/side.bar.twig' %}
+    {% include '@foo_bar/sidebar.twig' %}
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
index c8494cdfbc4..4bdffc45e0c 100644
--- a/cookbook/validation/custom_constraint.rst
+++ b/cookbook/validation/custom_constraint.rst
@@ -65,7 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
         public function validate($value, Constraint $constraint)
         {
             if (!preg_match('/^[a-zA-Za0-9]+$/', $value, $matches)) {
-                $this->context->addViolation($constraint->message, array('%string%' => $value));
+                $this->context->addViolation(
+                    $constraint->message,
+                    array('%string%' => $value)
+                );
             }
         }
     }
@@ -216,7 +219,12 @@ With this, the validator ``validate()`` method gets an object as its first argum
         public function validate($protocol, Constraint $constraint)
         {
             if ($protocol->getFoo() != $protocol->getBar()) {
-                $this->context->addViolationAt('foo', $constraint->message, array(), null);
+                $this->context->addViolationAt(
+                    'foo',
+                    $constraint->message,
+                    array(),
+                    null
+                );
             }
         }
     }
diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
index 18cbbd3103f..d688598008a 100644
--- a/reference/forms/types/button.rst
+++ b/reference/forms/types/button.rst
@@ -18,7 +18,7 @@ A simple, non-responsive button.
 |                      | - `label_attr`_                                                      |
 |                      | - `translation_domain`_                                              |
 +----------------------+----------------------------------------------------------------------+
-| Overridden Options   | - `auto_initialize`                                                  |
+| Overridden options   | - `auto_initialize`_                                                 |
 +----------------------+----------------------------------------------------------------------+
 | Parent type          | none                                                                 |
 +----------------------+----------------------------------------------------------------------+
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
index 159ef755c30..aeefb915ccf 100644
--- a/reference/forms/types/checkbox.rst
+++ b/reference/forms/types/checkbox.rst
@@ -13,9 +13,11 @@ if the box is unchecked, the value will be set to false.
 +-------------+------------------------------------------------------------------------+
 | Options     | - `value`_                                                             |
 +-------------+------------------------------------------------------------------------+
+| Overridden  | - `empty_data`_                                                        |
+| options     | - `compound`_                                                          |
++-------------+------------------------------------------------------------------------+
 | Inherited   | - `data`_                                                              |
-| options     | - `empty_data`_                                                        |
-|             | - `required`_                                                          |
+| options     | - `required`_                                                          |
 |             | - `label`_                                                             |
 |             | - `label_attr`_                                                        |
 |             | - `read_only`_                                                         |
@@ -44,6 +46,13 @@ Field Options
 
 .. include:: /reference/forms/types/options/value.rst.inc
 
+Overridden options
+------------------
+
+.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
+
+.. include:: /reference/forms/types/options/checkbox_compound.rst.inc
+
 Inherited options
 -----------------
 
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
index b69e48c32ed..c60b2f29f55 100644
--- a/reference/forms/types/choice.rst
+++ b/reference/forms/types/choice.rst
@@ -20,18 +20,20 @@ option.
 |             | - `preferred_choices`_                                                       |
 |             | - `empty_value`_                                                             |
 +-------------+------------------------------------------------------------------------------+
+| Overridden  | - `empty_data`_                                                              |
+| options     | - `compound`_                                                                |
+|             | - `error_bubbling`_                                                          |
++-------------+------------------------------------------------------------------------------+
 | Inherited   | - `required`_                                                                |
 | options     | - `label`_                                                                   |
 |             | - `label_attr`_                                                              |
 |             | - `data`_                                                                    |
 |             | - `read_only`_                                                               |
 |             | - `disabled`_                                                                |
-|             | - `error_bubbling`_                                                          |
 |             | - `error_mapping`_                                                           |
 |             | - `mapped`_                                                                  |
 |             | - `inherit_data`_                                                            |
 |             | - `by_reference`_                                                            |
-|             | - `empty_data`_                                                              |
 +-------------+------------------------------------------------------------------------------+
 | Parent type | :doc:`form </reference/forms/types/form>`                                    |
 +-------------+------------------------------------------------------------------------------+
@@ -109,6 +111,27 @@ can be created to supply the choices.
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
+Overridden options
+------------------
+
+.. include:: /reference/forms/types/options/empty_data.rst.inc
+
+compound
+~~~~~~~~
+
+**type**: ``boolean`` **default**: same value as ``expanded`` option
+
+This option specifies if a form is compound. The value is by default 
+overriden by the value of the ``expanded`` option.
+
+error_bubbling
+~~~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+Set that error on this field must be attached to the field instead of 
+the parent field (the form in most cases).
+
 Inherited options
 -----------------
 
@@ -126,8 +149,6 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc
-
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
@@ -135,5 +156,3 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/by_reference.rst.inc
-
-.. include:: /reference/forms/types/options/empty_data.rst.inc
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index dca2d76660f..76f91580dc8 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -29,6 +29,7 @@ forms, which is useful when creating forms that expose one-to-many relationships
 |             | - `empty_data`_                                                             |
 |             | - `required`_                                                               |
 |             | - `mapped`_                                                                 |
+|             | - `cascade_validation`_                                                     |
 +-------------+-----------------------------------------------------------------------------+
 | Parent type | :doc:`form </reference/forms/types/form>`                                   |
 +-------------+-----------------------------------------------------------------------------+
@@ -377,3 +378,5 @@ error_bubbling
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
+
+.. include:: /reference/forms/type/options/cascade_validation.rst.inc
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
index 43ab188086a..70d78cb2788 100644
--- a/reference/forms/types/form.rst
+++ b/reference/forms/types/form.rst
@@ -45,8 +45,6 @@ on all fields.
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
 
-.. include:: /reference/forms/types/options/empty_data.rst.inc
-
 .. include:: /reference/forms/types/options/by_reference.rst.inc
 
 .. include:: /reference/forms/types/options/error_bubbling.rst.inc
diff --git a/reference/forms/types/options/checkbox_compound.rst.inc b/reference/forms/types/options/checkbox_compound.rst.inc
new file mode 100644
index 00000000000..855969d870c
--- /dev/null
+++ b/reference/forms/types/options/checkbox_compound.rst.inc
@@ -0,0 +1,8 @@
+compound
+~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+This option specifies if a form is compound. As it's not the
+case for checkbox, by fefault the value is overriden with
+``false`` value.
diff --git a/reference/forms/types/options/checkbox_empty_data.rst.inc b/reference/forms/types/options/checkbox_empty_data.rst.inc
new file mode 100644
index 00000000000..8143ad364ce
--- /dev/null
+++ b/reference/forms/types/options/checkbox_empty_data.rst.inc
@@ -0,0 +1,9 @@
+empty_data
+~~~~~~~~~~
+
+**type**: ``string`` **default**: ``mixed``
+
+This option determines what value the field will return when the ``empty_value``
+choice is selected.
+In checkbox, the value of ``empty_data`` is overriden by the value returned by
+the data transformer (see :doc:`/cookbook/form/data_transformers.rst`).