diff --git a/_theme/_templates/layout.html b/_theme/_templates/layout.html
index 01bce31b749..35a9e2a2e99 100644
--- a/_theme/_templates/layout.html
+++ b/_theme/_templates/layout.html
@@ -44,9 +44,9 @@
         <div id="sidebar" class="col-sm-3">
             <div id="sidebar-content">
                 <div id="demo-warning">
-                    <h4>This is a demo</h4>
-                    <p>This is a demo provided by platform.sh.<br>
-                    <a href="http://symfony.com/doc/current/{{ pagename }}">Visit on symfony.com</a>.</p>
+                    <h4>Pull request build</h4>
+                    <p>Each pull request of the Symfony Documentation is automatically deployed and hosted on <a href="https://platform.sh">Platform.sh</a>.<br>
+                    Visit the page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
                 </div>
                 
                 {%- include "globaltoc.html" %}
diff --git a/book/http_cache.rst b/book/http_cache.rst
index 66c68721aac..1d5cb32132d 100644
--- a/book/http_cache.rst
+++ b/book/http_cache.rst
@@ -230,7 +230,7 @@ Here is a list of the main options:
 ``allow_revalidate``
     Specifies whether the client can force a cache revalidate by including a
     ``Cache-Control`` "max-age=0" directive in the request. Set it to ``true`` for
-    compliance with RFC 2616 (default: false).
+    compliance with RFC 2616 (default: ``false``).
 
 ``stale_while_revalidate``
     Specifies the default number of seconds (the granularity is the second as the
@@ -882,8 +882,8 @@ that data from its cache.
 
     If you want to use cache invalidation, have a look at the
     `FOSHttpCacheBundle`_. This bundle provides services to help with various
-    cache invalidation concepts, and also documents the configuration for the
-    a couple of common caching proxies.
+    cache invalidation concepts and also documents the configuration for a
+    couple of common caching proxies.
 
 If one content corresponds to one URL, the ``PURGE`` model works well.
 You send a request to the cache proxy with the HTTP method ``PURGE`` (using
diff --git a/book/security.rst b/book/security.rst
index adbf450a683..4f51874b261 100644
--- a/book/security.rst
+++ b/book/security.rst
@@ -512,7 +512,7 @@ else, you'll want to encode their passwords. The best algorithm to use is
 
 .. include:: /cookbook/security/_ircmaxwell_password-compat.rst.inc
 
-Of course, your user's passwords now need to be encoded with this exact algorithm.
+Of course, your users' passwords now need to be encoded with this exact algorithm.
 For hardcoded users, you can use an `online tool`_, which will give you something
 like this:
 
diff --git a/book/translation.rst b/book/translation.rst
index 3952c4b36d3..9ea6db1a6f8 100644
--- a/book/translation.rst
+++ b/book/translation.rst
@@ -593,7 +593,7 @@ use somewhere in your application::
         public $name;
     }
 
-Add constraints though any of the supported methods. Set the message option to the
+Add constraints through any of the supported methods. Set the message option to the
 translation source text. For example, to guarantee that the ``$name`` property is
 not empty, add the following:
 
diff --git a/book/validation.rst b/book/validation.rst
index f454b78e525..4df087566e1 100644
--- a/book/validation.rst
+++ b/book/validation.rst
@@ -734,19 +734,19 @@ user registers and when a user updates their contact information later:
         class User implements UserInterface
         {
             /**
-            * @Assert\Email(groups={"registration"})
-            */
+             * @Assert\Email(groups={"registration"})
+             */
             private $email;
 
             /**
-            * @Assert\NotBlank(groups={"registration"})
-            * @Assert\Length(min=7, groups={"registration"})
-            */
+             * @Assert\NotBlank(groups={"registration"})
+             * @Assert\Length(min=7, groups={"registration"})
+             */
             private $password;
 
             /**
-            * @Assert\Length(min=2)
-            */
+             * @Assert\Length(min=2)
+             */
             private $city;
         }
 
@@ -927,13 +927,13 @@ username and the password are different only if all other validation passes
         class User implements UserInterface
         {
             /**
-            * @Assert\NotBlank
-            */
+             * @Assert\NotBlank
+             */
             private $username;
 
             /**
-            * @Assert\NotBlank
-            */
+             * @Assert\NotBlank
+             */
             private $password;
 
             /**
diff --git a/components/dependency_injection/synthetic_services.rst b/components/dependency_injection/synthetic_services.rst
index d53e4636bdc..aba2c6d5710 100644
--- a/components/dependency_injection/synthetic_services.rst
+++ b/components/dependency_injection/synthetic_services.rst
@@ -27,7 +27,7 @@ service is injected into the container from within the ``Kernel`` class::
 The ``kernel`` service is called a synthetic service. This service has to
 be configured in the container, so the container knows the service does
 exist during compilation (otherwise, services depending on this ``kernel``
-service will get a "service does not exists" error).
+service will get a "service does not exist" error).
 
 In order to do so, you have to use
 :method:`Definition::setSynthetic() <Symfony\\Component\\DependencyInjection\\Definition::setSynthetic>`::
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
index e43f9347b68..986632053ce 100644
--- a/components/http_foundation/introduction.rst
+++ b/components/http_foundation/introduction.rst
@@ -464,8 +464,8 @@ represented by a PHP callable instead of a string::
     you must call ``ob_flush()`` before ``flush()``.
 
     Additionally, PHP isn't the only layer that can buffer output. Your web
-    server might also buffer based on its configuration. Even more, if you
-    use fastcgi, buffering can't be disabled at all.
+    server might also buffer based on its configuration. What's more, if you
+    use FastCGI, buffering can't be disabled at all.
 
 .. _component-http-foundation-serving-files:
 
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
index 69467b4dbfd..82eba4874dd 100644
--- a/components/routing/introduction.rst
+++ b/components/routing/introduction.rst
@@ -39,7 +39,7 @@ your autoloader to load the Routing component::
     $routes = new RouteCollection();
     $routes->add('route_name', $route);
 
-    $context = new RequestContext($_SERVER['REQUEST_URI']);
+    $context = new RequestContext('/');
 
     $matcher = new UrlMatcher($routes, $context);
 
@@ -203,7 +203,7 @@ a certain route::
     $routes = new RouteCollection();
     $routes->add('show_post', new Route('/show/{slug}'));
 
-    $context = new RequestContext($_SERVER['REQUEST_URI']);
+    $context = new RequestContext('/');
 
     $generator = new UrlGenerator($routes, $context);
 
@@ -323,7 +323,7 @@ automatically in the background if you want to use it. A basic example of the
 :class:`Symfony\\Component\\Routing\\Router` class would look like::
 
     $locator = new FileLocator(array(__DIR__));
-    $requestContext = new RequestContext($_SERVER['REQUEST_URI']);
+    $requestContext = new RequestContext('/');
 
     $router = new Router(
         new YamlFileLoader($locator),
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
index b50c5a3dac6..c989356a01d 100644
--- a/contributing/code/standards.rst
+++ b/contributing/code/standards.rst
@@ -37,6 +37,9 @@ example containing most features described below:
     {
         const SOME_CONST = 42;
 
+        /**
+         * @var string
+         */
         private $fooBar;
 
         /**
@@ -48,20 +51,30 @@ example containing most features described below:
         }
 
         /**
-         * @param string $dummy Some argument description
-         * @param array  $options
+         * Transforms the input given as first argument.
+         *
+         * @param bool|string $dummy   Some argument description
+         * @param array       $options An options collection to be used within the transformation
          *
-         * @return string|null Transformed input
+         * @return string|null The transformed input
          *
-         * @throws \RuntimeException
+         * @throws \RuntimeException When an invalid option is provided
          */
         private function transformText($dummy, array $options = array())
         {
+            $defaultOptions = array(
+                'some_default' => 'values',
+                'another_default' => 'more values',
+            );
+
+            foreach ($options as $option) {
+                if (!in_array($option, $defaultOptions)) {
+                    throw new \RuntimeException(sprintf('Unrecognized option "%s"', $option));
+                }
+            }
+
             $mergedOptions = array_merge(
-                array(
-                    'some_default' => 'values',
-                    'another_default' => 'more values',
-                ),
+                $defaultOptions,
                 $options
             );
 
@@ -76,10 +89,16 @@ example containing most features described below:
 
                 return ucwords($dummy);
             }
-
-            throw new \RuntimeException(sprintf('Unrecognized dummy option "%s"', $dummy));
         }
 
+        /**
+         * Performs some basic check for a given value.
+         *
+         * @param mixed $value     Some value to check against
+         * @param bool  $theSwitch Some switch to control the method's flow
+         *
+         * @return bool|null The resultant check if $theSwitch isn't false, null otherwise
+         */
         private function reverseBoolean($value = null, $theSwitch = false)
         {
             if (!$theSwitch) {
diff --git a/contributing/code/tests.rst b/contributing/code/tests.rst
index 913c5419b71..fed679128c5 100644
--- a/contributing/code/tests.rst
+++ b/contributing/code/tests.rst
@@ -16,14 +16,13 @@ In any case, it's a good practice to run tests locally before submitting a
 Before Running the Tests
 ------------------------
 
-To run the Symfony test suite, `install PHPUnit`_ 4.2 (or later) first. Then,
-install the external dependencies used during the tests, such as Doctrine, Twig
-and Monolog. To do so, :doc:`install Composer </cookbook/composer>` and execute
-the following:
+To run the Symfony test suite, install the external dependencies used during the
+tests, such as Doctrine, Twig and Monolog. To do so,
+:doc:`install Composer </cookbook/composer>` and execute the following:
 
 .. code-block:: bash
 
-    $ composer install
+    $ composer update
 
 .. _running:
 
@@ -35,7 +34,7 @@ command:
 
 .. code-block:: bash
 
-    $ phpunit
+    $ php ./phpunit symfony
 
 The output should display ``OK``. If not, read the reported errors to figure out
 what's going on and if the tests are broken because of the new code.
@@ -48,6 +47,12 @@ what's going on and if the tests are broken because of the new code.
 
     .. code-block:: bash
 
-        $ phpunit src/Symfony/Component/Finder/
+        $ php ./phpunit src/Symfony/Component/Finder/
 
-.. _`install PHPUnit`: https://phpunit.de/manual/current/en/installation.html
+.. tip::
+
+    On Windows, install the `ConEmu`_ or `ANSICON`_ free applications to see
+    colored test results.
+
+.. _ConEmu: https://code.google.com/p/conemu-maximus5/
+.. _ANSICON: https://github.com/adoxa/ansicon/releases
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
index 39b686872f5..e5bfcce1c95 100644
--- a/cookbook/cache/varnish.rst
+++ b/cookbook/cache/varnish.rst
@@ -75,23 +75,43 @@ session cookie, if there is one, and get rid of all other cookies so that pages
 are cached if there is no active session. Unless you changed the default
 configuration of PHP, your session cookie has the name ``PHPSESSID``:
 
-.. code-block:: varnish4
+.. configuration-block::
 
-    sub vcl_recv {
-        // Remove all cookies except the session ID.
-        if (req.http.Cookie) {
-            set req.http.Cookie = ";" + req.http.Cookie;
-            set req.http.Cookie = regsuball(req.http.Cookie, "; +", ";");
-            set req.http.Cookie = regsuball(req.http.Cookie, ";(PHPSESSID)=", "; \1=");
-            set req.http.Cookie = regsuball(req.http.Cookie, ";[^ ][^;]*", "");
-            set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
-
-            if (req.http.Cookie == "") {
-                // If there are no more cookies, remove the header to get page cached.
-                remove req.http.Cookie;
+    .. code-block:: varnish4
+
+        sub vcl_recv {
+            // Remove all cookies except the session ID.
+            if (req.http.Cookie) {
+                set req.http.Cookie = ";" + req.http.Cookie;
+                set req.http.Cookie = regsuball(req.http.Cookie, "; +", ";");
+                set req.http.Cookie = regsuball(req.http.Cookie, ";(PHPSESSID)=", "; \1=");
+                set req.http.Cookie = regsuball(req.http.Cookie, ";[^ ][^;]*", "");
+                set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
+    
+                if (req.http.Cookie == "") {
+                    // If there are no more cookies, remove the header to get page cached.
+                    unset req.http.Cookie;
+                }
+            }
+        }
+
+    .. code-block:: varnish3
+
+        sub vcl_recv {
+            // Remove all cookies except the session ID.
+            if (req.http.Cookie) {
+                set req.http.Cookie = ";" + req.http.Cookie;
+                set req.http.Cookie = regsuball(req.http.Cookie, "; +", ";");
+                set req.http.Cookie = regsuball(req.http.Cookie, ";(PHPSESSID)=", "; \1=");
+                set req.http.Cookie = regsuball(req.http.Cookie, ";[^ ][^;]*", "");
+                set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
+    
+                if (req.http.Cookie == "") {
+                    // If there are no more cookies, remove the header to get page cached.
+                    remove req.http.Cookie;
+                }
             }
         }
-    }
 
 .. tip::
 
diff --git a/cookbook/doctrine/event_listeners_subscribers.rst b/cookbook/doctrine/event_listeners_subscribers.rst
index bd1f322d0b3..93cbf3b4c1d 100644
--- a/cookbook/doctrine/event_listeners_subscribers.rst
+++ b/cookbook/doctrine/event_listeners_subscribers.rst
@@ -42,15 +42,15 @@ managers that use this connection.
 
         services:
             my.listener:
-                class: Acme\SearchBundle\EventListener\SearchIndexer
+                class: AppBundle\EventListener\SearchIndexer
                 tags:
                     - { name: doctrine.event_listener, event: postPersist }
             my.listener2:
-                class: Acme\SearchBundle\EventListener\SearchIndexer2
+                class: AppBundle\EventListener\SearchIndexer2
                 tags:
                     - { name: doctrine.event_listener, event: postPersist, connection: default }
             my.subscriber:
-                class: Acme\SearchBundle\EventListener\SearchIndexerSubscriber
+                class: AppBundle\EventListener\SearchIndexerSubscriber
                 tags:
                     - { name: doctrine.event_subscriber, connection: default }
 
@@ -67,13 +67,13 @@ managers that use this connection.
             </doctrine:config>
 
             <services>
-                <service id="my.listener" class="Acme\SearchBundle\EventListener\SearchIndexer">
+                <service id="my.listener" class="AppBundle\EventListener\SearchIndexer">
                     <tag name="doctrine.event_listener" event="postPersist" />
                 </service>
-                <service id="my.listener2" class="Acme\SearchBundle\EventListener\SearchIndexer2">
+                <service id="my.listener2" class="AppBundle\EventListener\SearchIndexer2">
                     <tag name="doctrine.event_listener" event="postPersist" connection="default" />
                 </service>
-                <service id="my.subscriber" class="Acme\SearchBundle\EventListener\SearchIndexerSubscriber">
+                <service id="my.subscriber" class="AppBundle\EventListener\SearchIndexerSubscriber">
                     <tag name="doctrine.event_subscriber" connection="default" />
                 </service>
             </services>
@@ -98,21 +98,21 @@ managers that use this connection.
         $container
             ->setDefinition(
                 'my.listener',
-                new Definition('Acme\SearchBundle\EventListener\SearchIndexer')
+                new Definition('AppBundle\EventListener\SearchIndexer')
             )
             ->addTag('doctrine.event_listener', array('event' => 'postPersist'))
         ;
         $container
             ->setDefinition(
                 'my.listener2',
-                new Definition('Acme\SearchBundle\EventListener\SearchIndexer2')
+                new Definition('AppBundle\EventListener\SearchIndexer2')
             )
             ->addTag('doctrine.event_listener', array('event' => 'postPersist', 'connection' => 'default'))
         ;
         $container
             ->setDefinition(
                 'my.subscriber',
-                new Definition('Acme\SearchBundle\EventListener\SearchIndexerSubscriber')
+                new Definition('AppBundle\EventListener\SearchIndexerSubscriber')
             )
             ->addTag('doctrine.event_subscriber', array('connection' => 'default'))
         ;
@@ -124,11 +124,11 @@ In the previous example, a service ``my.listener`` was configured as a Doctrine
 listener on the event ``postPersist``. The class behind that service must have
 a ``postPersist`` method, which will be called when the event is dispatched::
 
-    // src/Acme/SearchBundle/EventListener/SearchIndexer.php
-    namespace Acme\SearchBundle\EventListener;
+    // src/AppBundle/EventListener/SearchIndexer.php
+    namespace AppBundle\EventListener;
 
     use Doctrine\ORM\Event\LifecycleEventArgs;
-    use Acme\StoreBundle\Entity\Product;
+    use AppBundle\Entity\Product;
 
     class SearchIndexer
     {
@@ -166,13 +166,13 @@ Creating the Subscriber Class
 A Doctrine event subscriber must implement the ``Doctrine\Common\EventSubscriber``
 interface and have an event method for each event it subscribes to::
 
-    // src/Acme/SearchBundle/EventListener/SearchIndexerSubscriber.php
-    namespace Acme\SearchBundle\EventListener;
+    // src/AppBundle/EventListener/SearchIndexerSubscriber.php
+    namespace AppBundle\EventListener;
 
     use Doctrine\Common\EventSubscriber;
     use Doctrine\ORM\Event\LifecycleEventArgs;
     // for Doctrine 2.4: Doctrine\Common\Persistence\Event\LifecycleEventArgs;
-    use Acme\StoreBundle\Entity\Product;
+    use AppBundle\Entity\Product;
 
     class SearchIndexerSubscriber implements EventSubscriber
     {
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
index f1e677c2f6e..081100a218c 100644
--- a/cookbook/doctrine/file_uploads.rst
+++ b/cookbook/doctrine/file_uploads.rst
@@ -207,7 +207,7 @@ rules::
     .. code-block:: php
 
         // src/AppBundle/Entity/Document.php
-        namespace Acme\DemoBundle\Entity;
+        namespace AppBundle\Entity;
 
         // ...
         use Symfony\Component\Validator\Mapping\ClassMetadata;
diff --git a/cookbook/doctrine/registration_form.rst b/cookbook/doctrine/registration_form.rst
index b99c22d3a42..985ccad316b 100644
--- a/cookbook/doctrine/registration_form.rst
+++ b/cookbook/doctrine/registration_form.rst
@@ -15,8 +15,8 @@ The simple User Model
 
 You have a simple ``User`` entity mapped to the database::
 
-    // src/Acme/AccountBundle/Entity/User.php
-    namespace Acme\AccountBundle\Entity;
+    // src/AppBundle/Entity/User.php
+    namespace AppBundle\Entity;
 
     use Doctrine\ORM\Mapping as ORM;
     use Symfony\Component\Validator\Constraints as Assert;
@@ -106,8 +106,8 @@ Create a Form for the Model
 
 Next, create the form for the ``User`` model::
 
-    // src/Acme/AccountBundle/Form/Type/UserType.php
-    namespace Acme\AccountBundle\Form\Type;
+    // src/AppBundle/Form/Type/UserType.php
+    namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -128,7 +128,7 @@ Next, create the form for the ``User`` model::
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
-                'data_class' => 'Acme\AccountBundle\Entity\User'
+                'data_class' => 'AppBundle\Entity\User'
             ));
         }
 
@@ -156,17 +156,17 @@ be stored in the database.
 
 Start by creating a simple class which represents the "registration"::
 
-    // src/Acme/AccountBundle/Form/Model/Registration.php
-    namespace Acme\AccountBundle\Form\Model;
+    // src/AppBundle/Form/Model/Registration.php
+    namespace AppBundle\Form\Model;
 
     use Symfony\Component\Validator\Constraints as Assert;
 
-    use Acme\AccountBundle\Entity\User;
+    use AppBundle\Entity\User;
 
     class Registration
     {
         /**
-         * @Assert\Type(type="Acme\AccountBundle\Entity\User")
+         * @Assert\Type(type="AppBundle\Entity\User")
          * @Assert\Valid()
          */
         protected $user;
@@ -200,8 +200,8 @@ Start by creating a simple class which represents the "registration"::
 
 Next, create the form for this ``Registration`` model::
 
-    // src/Acme/AccountBundle/Form/Type/RegistrationType.php
-    namespace Acme\AccountBundle\Form\Type;
+    // src/AppBundle/Form/Type/RegistrationType.php
+    namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -236,13 +236,13 @@ Handling the Form Submission
 Next, you need a controller to handle the form. Start by creating a simple
 controller for displaying the registration form::
 
-    // src/Acme/AccountBundle/Controller/AccountController.php
-    namespace Acme\AccountBundle\Controller;
+    // src/AppBundle/Controller/AccountController.php
+    namespace AppBundle\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-    use Acme\AccountBundle\Form\Type\RegistrationType;
-    use Acme\AccountBundle\Form\Model\Registration;
+    use AppBundle\Form\Type\RegistrationType;
+    use AppBundle\Form\Model\Registration;
 
     class AccountController extends Controller
     {
@@ -254,7 +254,7 @@ controller for displaying the registration form::
             ));
 
             return $this->render(
-                'AcmeAccountBundle:Account:register.html.twig',
+                'AppBundle:Account:register.html.twig',
                 array('form' => $form->createView())
             );
         }
@@ -264,7 +264,7 @@ And its template:
 
 .. code-block:: html+jinja
 
-    {# src/Acme/AccountBundle/Resources/views/Account/register.html.twig #}
+    {# src/AppBundle/Resources/views/Account/register.html.twig #}
     {{ form(form) }}
 
 Next, create the controller which handles the form submission. This performs
@@ -291,7 +291,7 @@ the validation and saves the data into the database::
         }
 
         return $this->render(
-            'AcmeAccountBundle:Account:register.html.twig',
+            'AppBundle:Account:register.html.twig',
             array('form' => $form->createView())
         );
     }
@@ -307,44 +307,44 @@ Next, update your routes. If you're placing your routes inside your bundle
 
     .. code-block:: yaml
 
-        # src/Acme/AccountBundle/Resources/config/routing.yml
+        # src/AppBundle/Resources/config/routing.yml
         account_register:
             path:     /register
-            defaults: { _controller: AcmeAccountBundle:Account:register }
+            defaults: { _controller: AppBundle:Account:register }
 
         account_create:
             path:     /register/create
-            defaults: { _controller: AcmeAccountBundle:Account:create }
+            defaults: { _controller: AppBundle:Account:create }
 
     .. code-block:: xml
 
-        <!-- src/Acme/AccountBundle/Resources/config/routing.xml -->
+        <!-- src/AppBundle/Resources/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="account_register" path="/register">
-                <default key="_controller">AcmeAccountBundle:Account:register</default>
+                <default key="_controller">AppBundle:Account:register</default>
             </route>
 
             <route id="account_create" path="/register/create">
-                <default key="_controller">AcmeAccountBundle:Account:create</default>
+                <default key="_controller">AppBundle:Account:create</default>
             </route>
         </routes>
 
     .. code-block:: php
 
-        // src/Acme/AccountBundle/Resources/config/routing.php
+        // src/AppBundle/Resources/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
         $collection = new RouteCollection();
         $collection->add('account_register', new Route('/register', array(
-            '_controller' => 'AcmeAccountBundle:Account:register',
+            '_controller' => 'AppBundle:Account:register',
         )));
         $collection->add('account_create', new Route('/register/create', array(
-            '_controller' => 'AcmeAccountBundle:Account:create',
+            '_controller' => 'AppBundle:Account:create',
         )));
 
         return $collection;
diff --git a/cookbook/email/testing.rst b/cookbook/email/testing.rst
index 3797f81b582..270f7506895 100644
--- a/cookbook/email/testing.rst
+++ b/cookbook/email/testing.rst
@@ -31,7 +31,7 @@ Start with an easy controller action that sends an email::
     Don't forget to enable the profiler as explained in :doc:`/cookbook/testing/profiling`.
 
 In your functional test, use the ``swiftmailer`` collector on the profiler
-to get information about the messages send on the previous request::
+to get information about the messages sent on the previous request::
 
     // src/AppBundle/Tests/Controller/MailControllerTest.php
     use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst
index ab1703c7596..75c5d0a63db 100644
--- a/cookbook/form/create_form_type_extension.rst
+++ b/cookbook/form/create_form_type_extension.rst
@@ -14,16 +14,15 @@ extensions come in.
 
 Form type extensions have 2 main use-cases:
 
-#. You want to add a **generic feature to several types** (such as
-   adding a "help" text to every field type);
 #. You want to add a **specific feature to a single type** (such
-   as adding a "download" feature to the "file" field type).
+   as adding a "download" feature to the "file" field type);
+#. You want to add a **generic feature to several types** (such as
+   adding a "help" text to every "input text"-like type).
 
-In both those cases, it might be possible to achieve your goal with custom
-form rendering, or custom form field types. But using form type extensions
-can be cleaner (by limiting the amount of business logic in templates)
-and more flexible (you can add several type extensions to a single form
-type).
+It might be possible to achieve your goal with custom form rendering or custom
+form field types. But using form type extensions can be cleaner (by limiting the
+amount of business logic in templates) and more flexible (you can add several
+type extensions to a single form type).
 
 Form type extensions can achieve most of what custom field types can do,
 but instead of being field types of their own, **they plug into existing types**.
@@ -48,8 +47,8 @@ When creating a form type extension, you can either implement the
 or extend the :class:`Symfony\\Component\\Form\\AbstractTypeExtension`
 class. In most cases, it's easier to extend the abstract class::
 
-    // src/Acme/DemoBundle/Form/Extension/ImageTypeExtension.php
-    namespace Acme\DemoBundle\Form\Extension;
+    // src/AppBundle/Form/Extension/ImageTypeExtension.php
+    namespace AppBundle\Form\Extension;
 
     use Symfony\Component\Form\AbstractTypeExtension;
 
@@ -103,15 +102,15 @@ tag:
     .. code-block:: yaml
 
         services:
-            acme_demo_bundle.image_type_extension:
-                class: Acme\DemoBundle\Form\Extension\ImageTypeExtension
+            app.image_type_extension:
+                class: AppBundle\Form\Extension\ImageTypeExtension
                 tags:
                     - { name: form.type_extension, alias: file }
 
     .. code-block:: xml
 
-        <service id="acme_demo_bundle.image_type_extension"
-            class="Acme\DemoBundle\Form\Extension\ImageTypeExtension"
+        <service id="app.image_type_extension"
+            class="AppBundle\Form\Extension\ImageTypeExtension"
         >
             <tag name="form.type_extension" alias="file" />
         </service>
@@ -120,8 +119,8 @@ tag:
 
         $container
             ->register(
-                'acme_demo_bundle.image_type_extension',
-                'Acme\DemoBundle\Form\Extension\ImageTypeExtension'
+                'app.image_type_extension',
+                'AppBundle\Form\Extension\ImageTypeExtension'
             )
             ->addTag('form.type_extension', array('alias' => 'file'));
 
@@ -140,8 +139,8 @@ you have a Media model with a file property (corresponding to the file field
 in the form) and a path property (corresponding to the image path in the
 database)::
 
-    // src/Acme/DemoBundle/Entity/Media.php
-    namespace Acme\DemoBundle\Entity;
+    // src/AppBundle/Entity/Media.php
+    namespace AppBundle\Entity;
 
     use Symfony\Component\Validator\Constraints as Assert;
 
@@ -188,8 +187,8 @@ you will be able to specify a new option: ``image_path``. This option will
 tell the file field how to get the actual image URL in order to display
 it in the view::
 
-    // src/Acme/DemoBundle/Form/Extension/ImageTypeExtension.php
-    namespace Acme\DemoBundle\Form\Extension;
+    // src/AppBundle/Form/Extension/ImageTypeExtension.php
+    namespace AppBundle\Form\Extension;
 
     use Symfony\Component\Form\AbstractTypeExtension;
     use Symfony\Component\Form\FormView;
@@ -260,7 +259,7 @@ Specifically, you need to override the ``file_widget`` block:
 
     .. code-block:: html+jinja
 
-        {# src/Acme/DemoBundle/Resources/views/Form/fields.html.twig #}
+        {# src/AppBundle/Resources/views/Form/fields.html.twig #}
         {% extends 'form_div_layout.html.twig' %}
 
         {% block file_widget %}
@@ -276,7 +275,7 @@ Specifically, you need to override the ``file_widget`` block:
 
     .. code-block:: html+php
 
-        <!-- src/Acme/DemoBundle/Resources/views/Form/file_widget.html.php -->
+        <!-- src/AppBundle/Resources/views/Form/file_widget.html.php -->
         <?php echo $view['form']->widget($form) ?>
         <?php if (null !== $image_url): ?>
             <img src="<?php echo $view['assets']->getUrl($image_url) ?>"/>
@@ -296,8 +295,8 @@ From now on, when adding a field of type ``file`` in your form, you can
 specify an ``image_path`` option that will be used to display an image
 next to the file field. For example::
 
-    // src/Acme/DemoBundle/Form/Type/MediaType.php
-    namespace Acme\DemoBundle\Form\Type;
+    // src/AppBundle/Form/Type/MediaType.php
+    namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -319,3 +318,19 @@ next to the file field. For example::
 
 When displaying the form, if the underlying model has already been associated
 with an image, you will see it displayed next to the file input.
+
+Generic Form Type Extensions
+----------------------------
+
+You can modify several form types at once by specifying their common parent
+(:doc:`/reference/forms/types`). For example, several form types natively
+available in Symfony inherit from the ``text`` form type (such as ``email``,
+``search``, ``url``, etc.). A form type extension applying to ``text``
+(i.e. whose ``getExtendedType`` method returns ``text``) would apply to all of
+these form types.
+
+In the same way, since **most** form types natively available in Symfony inherit
+from the ``form`` form type, a form type extension applying to ``form`` would
+apply to all of these.  A notable exception are the ``button`` form types. Also
+keep in mind that a custom form type which extends neither the ``form`` nor
+the ``button`` type could always be created.
diff --git a/cookbook/form/direct_submit.rst b/cookbook/form/direct_submit.rst
index 7166210319b..8fd9e642e89 100644
--- a/cookbook/form/direct_submit.rst
+++ b/cookbook/form/direct_submit.rst
@@ -28,7 +28,7 @@ submissions::
             return $this->redirectToRoute('task_success');
         }
 
-        return $this->render('AcmeTaskBundle:Default:new.html.twig', array(
+        return $this->render('AppBundle:Default:new.html.twig', array(
             'form' => $form->createView(),
         ));
     }
@@ -70,7 +70,7 @@ method, pass the submitted data directly to
             }
         }
 
-        return $this->render('AcmeTaskBundle:Default:new.html.twig', array(
+        return $this->render('AppBundle:Default:new.html.twig', array(
             'form' => $form->createView(),
         ));
     }
@@ -115,7 +115,7 @@ a convenient shortcut to the previous example::
             }
         }
 
-        return $this->render('AcmeTaskBundle:Default:new.html.twig', array(
+        return $this->render('AppBundle:Default:new.html.twig', array(
             'form' => $form->createView(),
         ));
     }
diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst
index df8ca2dfa24..f42c8c20b57 100644
--- a/cookbook/form/form_collections.rst
+++ b/cookbook/form/form_collections.rst
@@ -23,8 +23,8 @@ that Task, right inside the same form.
 First, suppose that each ``Task`` belongs to multiple ``Tag`` objects. Start
 by creating a simple ``Task`` class::
 
-    // src/Acme/TaskBundle/Entity/Task.php
-    namespace Acme\TaskBundle\Entity;
+    // src/AppBundle/Entity/Task.php
+    namespace AppBundle\Entity;
 
     use Doctrine\Common\Collections\ArrayCollection;
 
@@ -64,8 +64,8 @@ by creating a simple ``Task`` class::
 Now, create a ``Tag`` class. As you saw above, a ``Task`` can have many ``Tag``
 objects::
 
-    // src/Acme/TaskBundle/Entity/Tag.php
-    namespace Acme\TaskBundle\Entity;
+    // src/AppBundle/Entity/Tag.php
+    namespace AppBundle\Entity;
 
     class Tag
     {
@@ -79,8 +79,8 @@ objects::
 
 Then, create a form class so that a ``Tag`` object can be modified by the user::
 
-    // src/Acme/TaskBundle/Form/Type/TagType.php
-    namespace Acme\TaskBundle\Form\Type;
+    // src/AppBundle/Form/Type/TagType.php
+    namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -96,7 +96,7 @@ Then, create a form class so that a ``Tag`` object can be modified by the user::
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
-                'data_class' => 'Acme\TaskBundle\Entity\Tag',
+                'data_class' => 'AppBundle\Entity\Tag',
             ));
         }
 
@@ -113,8 +113,8 @@ form itself, create a form for the ``Task`` class.
 Notice that you embed a collection of ``TagType`` forms using the
 :doc:`collection </reference/forms/types/collection>` field type::
 
-    // src/Acme/TaskBundle/Form/Type/TaskType.php
-    namespace Acme\TaskBundle\Form\Type;
+    // src/AppBundle/Form/Type/TaskType.php
+    namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -132,7 +132,7 @@ Notice that you embed a collection of ``TagType`` forms using the
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
-                'data_class' => 'Acme\TaskBundle\Entity\Task',
+                'data_class' => 'AppBundle\Entity\Task',
             ));
         }
 
@@ -144,12 +144,12 @@ Notice that you embed a collection of ``TagType`` forms using the
 
 In your controller, you'll now initialize a new instance of ``TaskType``::
 
-    // src/Acme/TaskBundle/Controller/TaskController.php
-    namespace Acme\TaskBundle\Controller;
+    // src/AppBundle/Controller/TaskController.php
+    namespace AppBundle\Controller;
 
-    use Acme\TaskBundle\Entity\Task;
-    use Acme\TaskBundle\Entity\Tag;
-    use Acme\TaskBundle\Form\Type\TaskType;
+    use AppBundle\Entity\Task;
+    use AppBundle\Entity\Tag;
+    use AppBundle\Form\Type\TaskType;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
@@ -177,7 +177,7 @@ In your controller, you'll now initialize a new instance of ``TaskType``::
                 // ... maybe do some form processing, like saving the Task and Tag objects
             }
 
-            return $this->render('AcmeTaskBundle:Task:new.html.twig', array(
+            return $this->render('AppBundle:Task:new.html.twig', array(
                 'form' => $form->createView(),
             ));
         }
@@ -193,7 +193,7 @@ zero tags when first created).
 
     .. code-block:: html+jinja
 
-        {# src/Acme/TaskBundle/Resources/views/Task/new.html.twig #}
+        {# src/AppBundle/Resources/views/Task/new.html.twig #}
 
         {# ... #}
 
@@ -214,7 +214,7 @@ zero tags when first created).
 
     .. code-block:: html+php
 
-        <!-- src/Acme/TaskBundle/Resources/views/Task/new.html.php -->
+        <!-- src/AppBundle/Resources/views/Task/new.html.php -->
 
         <!-- ... -->
 
@@ -275,7 +275,7 @@ type expects to receive exactly two, otherwise an error will be thrown:
 ``This form should not contain extra fields``. To make this flexible,
 add the ``allow_add`` option to your collection field::
 
-    // src/Acme/TaskBundle/Form/Type/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
 
     // ...
     use Symfony\Component\Form\FormBuilderInterface;
@@ -420,8 +420,8 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje
 To make handling these new tags easier, add an "adder" and a "remover" method
 for the tags in the ``Task`` class::
 
-    // src/Acme/TaskBundle/Entity/Task.php
-    namespace Acme\TaskBundle\Entity;
+    // src/AppBundle/Entity/Task.php
+    namespace AppBundle\Entity;
 
     // ...
     class Task
@@ -441,7 +441,7 @@ for the tags in the ``Task`` class::
 
 Next, add a ``by_reference`` option to the ``tags`` field and set it to ``false``::
 
-    // src/Acme/TaskBundle/Form/Type/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
 
     // ...
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -475,7 +475,7 @@ you will learn about next!).
     Doctrine:
 
         A new entity was found through the relationship
-        ``Acme\TaskBundle\Entity\Task#tags`` that was not configured to
+        ``AppBundle\Entity\Task#tags`` that was not configured to
         cascade persist operations for entity...
 
     To fix this, you may choose to "cascade" the persist operation automatically
@@ -486,7 +486,7 @@ you will learn about next!).
 
         .. code-block:: php-annotations
 
-            // src/Acme/TaskBundle/Entity/Task.php
+            // src/AppBundle/Entity/Task.php
 
             // ...
 
@@ -497,8 +497,8 @@ you will learn about next!).
 
         .. code-block:: yaml
 
-            # src/Acme/TaskBundle/Resources/config/doctrine/Task.orm.yml
-            Acme\TaskBundle\Entity\Task:
+            # src/AppBundle/Resources/config/doctrine/Task.orm.yml
+            AppBundle\Entity\Task:
                 type: entity
                 # ...
                 oneToMany:
@@ -508,13 +508,13 @@ you will learn about next!).
 
         .. code-block:: xml
 
-            <!-- src/Acme/TaskBundle/Resources/config/doctrine/Task.orm.xml -->
+            <!-- src/AppBundle/Resources/config/doctrine/Task.orm.xml -->
             <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                                 http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-                <entity name="Acme\TaskBundle\Entity\Task">
+                <entity name="AppBundle\Entity\Task">
                     <!-- ... -->
                     <one-to-many field="tags" target-entity="Tag">
                         <cascade>
@@ -536,7 +536,7 @@ you will learn about next!).
     which is called by the form type since ``by_reference`` is set to
     ``false``::
 
-        // src/Acme/TaskBundle/Entity/Task.php
+        // src/AppBundle/Entity/Task.php
 
         // ...
         public function addTag(Tag $tag)
@@ -548,7 +548,7 @@ you will learn about next!).
 
     Inside ``Tag``, just make sure you have an ``addTask`` method::
 
-        // src/Acme/TaskBundle/Entity/Tag.php
+        // src/AppBundle/Entity/Tag.php
 
         // ...
         public function addTask(Task $task)
@@ -571,7 +571,7 @@ The solution is similar to allowing tags to be added.
 
 Start by adding the ``allow_delete`` option in the form Type::
 
-    // src/Acme/TaskBundle/Form/Type/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
 
     // ...
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -586,7 +586,7 @@ Start by adding the ``allow_delete`` option in the form Type::
 
 Now, you need to put some code into the ``removeTag`` method of ``Task``::
 
-    // src/Acme/TaskBundle/Entity/Task.php
+    // src/AppBundle/Entity/Task.php
 
     // ...
     class Task
@@ -670,7 +670,7 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     on the removed tag. This assumes that you have some ``editAction`` which
     is handling the "update" of your Task::
 
-        // src/Acme/TaskBundle/Controller/TaskController.php
+        // src/AppBundle/Controller/TaskController.php
 
         use Doctrine\Common\Collections\ArrayCollection;
 
@@ -678,7 +678,7 @@ the relationship between the removed ``Tag`` and ``Task`` object.
         public function editAction($id, Request $request)
         {
             $em = $this->getDoctrine()->getManager();
-            $task = $em->getRepository('AcmeTaskBundle:Task')->find($id);
+            $task = $em->getRepository('AppBundle:Task')->find($id);
 
             if (!$task) {
                 throw $this->createNotFoundException('No task found for id '.$id);
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
index 3714cc9372d..e27d944cb7e 100644
--- a/cookbook/form/unit_testing.rst
+++ b/cookbook/form/unit_testing.rst
@@ -36,11 +36,11 @@ The Basics
 
 The simplest ``TypeTestCase`` implementation looks like the following::
 
-    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTest.php
-    namespace Acme\TestBundle\Tests\Form\Type;
+    // src/AppBundle/Tests/Form/Type/TestedTypeTest.php
+    namespace AppBundle\Tests\Form\Type;
 
-    use Acme\TestBundle\Form\Type\TestedType;
-    use Acme\TestBundle\Model\TestObject;
+    use AppBundle\Form\Type\TestedType;
+    use AppBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
 
     class TestedTypeTest extends TypeTestCase
@@ -115,20 +115,20 @@ Adding a Type your Form Depends on
 Your form may depend on other types that are defined as services. It
 might look like this::
 
-    // src/Acme/TestBundle/Form/Type/TestedType.php
+    // src/AppBundle/Form/Type/TestedType.php
 
     // ... the buildForm method
-    $builder->add('acme_test_child_type');
+    $builder->add('app_test_child_type');
 
 To create your form correctly, you need to make the type available to the
 form factory in your test. The easiest way is to register it manually
 before creating the parent form using the ``PreloadedExtension`` class::
 
-    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTests.php
-    namespace Acme\TestBundle\Tests\Form\Type;
+    // src/AppBundle/Tests/Form/Type/TestedTypeTests.php
+    namespace AppBundle\Tests\Form\Type;
 
-    use Acme\TestBundle\Form\Type\TestedType;
-    use Acme\TestBundle\Model\TestObject;
+    use AppBundle\Form\Type\TestedType;
+    use AppBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
     use Symfony\Component\Form\PreloadedExtension;
 
@@ -137,6 +137,7 @@ before creating the parent form using the ``PreloadedExtension`` class::
         protected function getExtensions()
         {
             $childType = new TestChildType();
+
             return array(new PreloadedExtension(array(
                 $childType->getName() => $childType,
             ), array()));
@@ -165,13 +166,13 @@ It often happens that you use some options that are added by
 cases may be the ``ValidatorExtension`` with its ``invalid_message`` option.
 The ``TypeTestCase`` loads only the core form extension so an "Invalid option"
 exception will be raised if you try to use it for testing a class that depends
-on other extensions. You need add those extensions to the factory object::
+on other extensions. You need to add those extensions to the factory object::
 
-    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTests.php
-    namespace Acme\TestBundle\Tests\Form\Type;
+    // src/AppBundle/Tests/Form/Type/TestedTypeTests.php
+    namespace AppBundle\Tests\Form\Type;
 
-    use Acme\TestBundle\Form\Type\TestedType;
-    use Acme\TestBundle\Model\TestObject;
+    use AppBundle\Form\Type\TestedType;
+    use AppBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
     use Symfony\Component\Form\Forms;
     use Symfony\Component\Form\FormBuilder;
@@ -216,11 +217,11 @@ Testing against different Sets of Data
 If you are not familiar yet with PHPUnit's `data providers`_, this might be
 a good opportunity to use them::
 
-    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTests.php
-    namespace Acme\TestBundle\Tests\Form\Type;
+    // src/AppBundle/Tests/Form/Type/TestedTypeTests.php
+    namespace AppBundle\Tests\Form\Type;
 
-    use Acme\TestBundle\Form\Type\TestedType;
-    use Acme\TestBundle\Model\TestObject;
+    use AppBundle\Form\Type\TestedType;
+    use AppBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
 
     class TestedTypeTest extends TypeTestCase
diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst
index 4035ccff44c..28db626cda6 100644
--- a/cookbook/logging/monolog.rst
+++ b/cookbook/logging/monolog.rst
@@ -303,7 +303,7 @@ using a processor.
 
 .. code-block:: php
 
-    namespace Acme\MyBundle;
+    namespace AppBundle;
 
     use Symfony\Component\HttpFoundation\Session\Session;
 
@@ -345,7 +345,7 @@ using a processor.
                     - "[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%% %%context%% %%extra%%\n"
 
             monolog.processor.session_request:
-                class: Acme\MyBundle\SessionRequestProcessor
+                class: AppBundle\SessionRequestProcessor
                 arguments:  ["@session"]
                 tags:
                     - { name: monolog.processor, method: processRecord }
@@ -378,7 +378,7 @@ using a processor.
                 </service>
 
                 <service id="monolog.processor.session_request"
-                    class="Acme\MyBundle\SessionRequestProcessor">
+                    class="AppBundle\SessionRequestProcessor">
 
                     <argument type="service" id="session" />
                     <tag name="monolog.processor" method="processRecord" />
@@ -409,7 +409,7 @@ using a processor.
         $container
             ->register(
                 'monolog.processor.session_request',
-                'Acme\MyBundle\SessionRequestProcessor'
+                'AppBundle\SessionRequestProcessor'
             )
             ->addArgument(new Reference('session'))
             ->addTag('monolog.processor', array('method' => 'processRecord'));
@@ -444,7 +444,7 @@ the ``monolog.processor`` tag:
         # app/config/config.yml
         services:
             monolog.processor.session_request:
-                class: Acme\MyBundle\SessionRequestProcessor
+                class: AppBundle\SessionRequestProcessor
                 arguments:  ["@session"]
                 tags:
                     - { name: monolog.processor, method: processRecord, handler: main }
@@ -463,7 +463,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="monolog.processor.session_request"
-                    class="Acme\MyBundle\SessionRequestProcessor">
+                    class="AppBundle\SessionRequestProcessor">
 
                     <argument type="service" id="session" />
                     <tag name="monolog.processor" method="processRecord" handler="main" />
@@ -477,7 +477,7 @@ the ``monolog.processor`` tag:
         $container
             ->register(
                 'monolog.processor.session_request',
-                'Acme\MyBundle\SessionRequestProcessor'
+                'AppBundle\SessionRequestProcessor'
             )
             ->addArgument(new Reference('session'))
             ->addTag('monolog.processor', array('method' => 'processRecord', 'handler' => 'main'));
@@ -495,7 +495,7 @@ the ``monolog.processor`` tag:
         # app/config/config.yml
         services:
             monolog.processor.session_request:
-                class: Acme\MyBundle\SessionRequestProcessor
+                class: AppBundle\SessionRequestProcessor
                 arguments:  ["@session"]
                 tags:
                     - { name: monolog.processor, method: processRecord, channel: main }
@@ -514,7 +514,7 @@ the ``monolog.processor`` tag:
 
             <services>
                 <service id="monolog.processor.session_request"
-                    class="Acme\MyBundle\SessionRequestProcessor">
+                    class="AppBundle\SessionRequestProcessor">
 
                     <argument type="service" id="session" />
                     <tag name="monolog.processor" method="processRecord" channel="main" />
@@ -528,7 +528,7 @@ the ``monolog.processor`` tag:
         $container
             ->register(
                 'monolog.processor.session_request',
-                'Acme\MyBundle\SessionRequestProcessor'
+                'AppBundle\SessionRequestProcessor'
             )
             ->addArgument(new Reference('session'))
             ->addTag('monolog.processor', array('method' => 'processRecord', 'channel' => 'main'));
diff --git a/cookbook/profiler/data_collector.rst b/cookbook/profiler/data_collector.rst
index 74e7d07006a..05343769443 100644
--- a/cookbook/profiler/data_collector.rst
+++ b/cookbook/profiler/data_collector.rst
@@ -180,8 +180,7 @@ All blocks have access to the ``collector`` object.
         echo base64_encode(file_get_contents($_SERVER['argv'][1]));
 
 To enable the template, add a ``template`` attribute to the ``data_collector``
-tag in your configuration. For example, assuming your template is in some
-AcmeDebugBundle:
+tag in your configuration. For example, assuming your template is in AppBundle:
 
 .. configuration-block::
 
@@ -189,22 +188,22 @@ AcmeDebugBundle:
 
         services:
             data_collector.your_collector_name:
-                class: Acme\DebugBundle\Collector\Class\Name
+                class: AppBundle\Collector\Class\Name
                 tags:
-                    - { name: data_collector, template: "AcmeDebugBundle:Collector:templatename", id: "your_collector_name" }
+                    - { name: data_collector, template: "AppBundle:Collector:templatename", id: "your_collector_name" }
 
     .. code-block:: xml
 
-        <service id="data_collector.your_collector_name" class="Acme\DebugBundle\Collector\Class\Name">
-            <tag name="data_collector" template="AcmeDebugBundle:Collector:templatename" id="your_collector_name" />
+        <service id="data_collector.your_collector_name" class="AppBundle\Collector\Class\Name">
+            <tag name="data_collector" template="AppBundle:Collector:templatename" id="your_collector_name" />
         </service>
 
     .. code-block:: php
 
         $container
-            ->register('data_collector.your_collector_name', 'Acme\DebugBundle\Collector\Class\Name')
+            ->register('data_collector.your_collector_name', 'AppBundle\Collector\Class\Name')
             ->addTag('data_collector', array(
-                'template' => 'AcmeDebugBundle:Collector:templatename',
+                'template' => 'AppBundle:Collector:templatename',
                 'id'       => 'your_collector_name',
             ))
         ;
diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst
index 5d3d5553a3b..b881393d91b 100644
--- a/cookbook/security/acl.rst
+++ b/cookbook/security/acl.rst
@@ -239,7 +239,7 @@ added above:
 
 .. code-block:: php
 
-    $identity = new UserSecurityIdentity('johannes', 'Acme\UserBundle\Entity\User');
+    $identity = new UserSecurityIdentity('johannes', 'AppBundle\Entity\User');
     $acl->insertObjectAce($identity, $mask);
 
 The user is now allowed to view, edit, delete, and un-delete objects.
diff --git a/cookbook/security/csrf_in_login_form.rst b/cookbook/security/csrf_in_login_form.rst
index 43f4195b13e..214a5095dc7 100644
--- a/cookbook/security/csrf_in_login_form.rst
+++ b/cookbook/security/csrf_in_login_form.rst
@@ -89,7 +89,7 @@ using the login form:
 
     .. code-block:: html+jinja
 
-        {# src/Acme/SecurityBundle/Resources/views/Security/login.html.twig #}
+        {# src/AppBundle/Resources/views/Security/login.html.twig #}
 
         {# ... #}
         <form action="{{ path('login_check') }}" method="post">
@@ -104,7 +104,7 @@ using the login form:
 
     .. code-block:: html+php
 
-        <!-- src/Acme/SecurityBundle/Resources/views/Security/login.html.php -->
+        <!-- src/AppBundle/Resources/views/Security/login.html.php -->
 
         <!-- ... -->
         <form action="<?php echo $view['router']->generate('login_check') ?>" method="post">
diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst
index e05e6067e58..766f69a8101 100644
--- a/cookbook/security/form_login.rst
+++ b/cookbook/security/form_login.rst
@@ -229,7 +229,7 @@ redirect to the URL defined by some ``account`` route, use the following:
 
     .. code-block:: html+jinja
 
-        {# src/Acme/SecurityBundle/Resources/views/Security/login.html.twig #}
+        {# src/AppBundle/Resources/views/Security/login.html.twig #}
         {% if error %}
             <div>{{ error.message }}</div>
         {% endif %}
@@ -248,7 +248,7 @@ redirect to the URL defined by some ``account`` route, use the following:
 
     .. code-block:: html+php
 
-        <!-- src/Acme/SecurityBundle/Resources/views/Security/login.html.php -->
+        <!-- src/AppBundle/Resources/views/Security/login.html.php -->
         <?php if ($error): ?>
             <div><?php echo $error->getMessage() ?></div>
         <?php endif ?>
diff --git a/cookbook/security/form_login_setup.rst b/cookbook/security/form_login_setup.rst
index 1cefa8b7b0f..8f0eb5c403d 100644
--- a/cookbook/security/form_login_setup.rst
+++ b/cookbook/security/form_login_setup.rst
@@ -239,7 +239,7 @@ Finally, create the template:
 
     .. code-block:: html+php
 
-        <!-- src/Acme/SecurityBundle/Resources/views/Security/login.html.php -->
+        <!-- src/AppBundle/Resources/views/Security/login.html.php -->
         <?php if ($error): ?>
             <div><?php echo $error->getMessage() ?></div>
         <?php endif ?>
diff --git a/cookbook/security/multiple_user_providers.rst b/cookbook/security/multiple_user_providers.rst
index 14940627057..b90c71e6d49 100644
--- a/cookbook/security/multiple_user_providers.rst
+++ b/cookbook/security/multiple_user_providers.rst
@@ -22,7 +22,7 @@ a new provider that chains the two together:
                         users:
                             foo: { password: test }
                 user_db:
-                    entity: { class: Acme\UserBundle\Entity\User, property: username }
+                    entity: { class: AppBundle\Entity\User, property: username }
 
     .. code-block:: xml
 
@@ -49,7 +49,7 @@ a new provider that chains the two together:
                 </provider>
 
                 <provider name="user_db">
-                    <entity class="Acme\UserBundle\Entity\User" property="username" />
+                    <entity class="AppBundle\Entity\User" property="username" />
                 </provider>
             </config>
         </srv:container>
@@ -73,7 +73,7 @@ a new provider that chains the two together:
                 ),
                 'user_db' => array(
                     'entity' => array(
-                        'class' => 'Acme\UserBundle\Entity\User',
+                        'class' => 'AppBundle\Entity\User',
                         'property' => 'username',
                     ),
                 ),
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
index db56fb9af2e..9c980c38f6c 100644
--- a/cookbook/security/voters.rst
+++ b/cookbook/security/voters.rst
@@ -96,9 +96,8 @@ edit a particular object. Here's an example implementation:
                 return false;
             }
 
-            // double-check that the User object is the expected entity.
-            // It always will be, unless there is some misconfiguration of the
-            // security system.
+            // double-check that the User object is the expected entity (this
+            // only happens when you did not configure the security system properly)
             if (!$user instanceof User) {
                 throw new \LogicException('The user is somehow not our User class!');
             }
@@ -121,7 +120,7 @@ edit a particular object. Here's an example implementation:
 
                     break;
             }
-            
+
             return false;
         }
     }
@@ -183,7 +182,8 @@ and tag it with ``security.voter``:
             <services>
                 <service id="security.access.post_voter"
                     class="AppBundle\Security\Authorization\Voter\PostVoter"
-                    public="false">
+                    public="false"
+                >
 
                     <tag name="security.voter" />
                 </service>
@@ -194,7 +194,7 @@ and tag it with ``security.voter``:
 
         // app/config/services.php
         use Symfony\Component\DependencyInjection\Definition;
-        
+
         $definition = new Definition('AppBundle\Security\Authorization\Voter\PostVoter');
         $definition
             ->setPublic(false)
@@ -224,7 +224,14 @@ from the authorization checker is called.
             // get a Post instance
             $post = ...;
 
+<<<<<<< HEAD
             $this->denyAccessUnlessGranted('view', $post, 'Unauthorized access!');
+=======
+            // keep in mind that this will call all registered security voters
+            if (false === $this->get('security.context')->isGranted('view', $post)) {
+                throw new AccessDeniedException('Unauthorized access!');
+            }
+>>>>>>> 2.3
 
             return new Response('<h1>'.$post->getName().'</h1>');
         }
diff --git a/cookbook/templating/global_variables.rst b/cookbook/templating/global_variables.rst
index 4250f834c03..0226b3cf9ec 100644
--- a/cookbook/templating/global_variables.rst
+++ b/cookbook/templating/global_variables.rst
@@ -106,14 +106,14 @@ This should feel familiar, as it's the same syntax you use in service configurat
         twig:
             # ...
             globals:
-                user_management: "@acme_user.user_management"
+                user_management: "@app.user_management"
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config>
             <!-- ... -->
-            <twig:global key="user_management">@acme_user.user_management</twig:global>
+            <twig:global key="user_management">@app.user_management</twig:global>
         </twig:config>
 
     .. code-block:: php
@@ -122,7 +122,7 @@ This should feel familiar, as it's the same syntax you use in service configurat
         $container->loadFromExtension('twig', array(
              // ...
              'globals' => array(
-                 'user_management' => '@acme_user.user_management',
+                 'user_management' => '@app.user_management',
              ),
         ));
 
diff --git a/cookbook/testing/doctrine.rst b/cookbook/testing/doctrine.rst
index e3e3e4b1b3a..c263d18c91c 100644
--- a/cookbook/testing/doctrine.rst
+++ b/cookbook/testing/doctrine.rst
@@ -20,8 +20,8 @@ If you need to actually execute a query, you will need to boot the kernel
 to get a valid connection. In this case, you'll extend the ``KernelTestCase``,
 which makes all of this quite easy::
 
-    // src/Acme/StoreBundle/Tests/Entity/ProductRepositoryFunctionalTest.php
-    namespace Acme\StoreBundle\Tests\Entity;
+    // src/AppBundle/Tests/Entity/ProductRepositoryFunctionalTest.php
+    namespace AppBundle\Tests\Entity;
 
     use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
@@ -47,7 +47,7 @@ which makes all of this quite easy::
         public function testSearchByCategoryName()
         {
             $products = $this->em
-                ->getRepository('AcmeStoreBundle:Product')
+                ->getRepository('AppBundle:Product')
                 ->searchByCategoryName('foo')
             ;
 
diff --git a/images/contributing/release-process.jpg b/images/contributing/release-process.jpg
index 28c58b3fdad..df73b9b1a73 100644
Binary files a/images/contributing/release-process.jpg and b/images/contributing/release-process.jpg differ
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
index ae9415ea4fe..5a355b92932 100644
--- a/reference/configuration/assetic.rst
+++ b/reference/configuration/assetic.rst
@@ -16,8 +16,8 @@ Full Default Configuration
             use_controller:
                 enabled:              "%kernel.debug%"
                 profiler:             false
-            read_from:            "%kernel.root_dir%/../web"
-            write_to:             "%assetic.read_from%"
+            read_from:            "%assetic.read_from%"
+            write_to:             "%kernel.root_dir%/../web"
             java:                 /usr/bin/java
             node:                 /usr/bin/node
             ruby:                 /usr/bin/ruby
@@ -64,8 +64,8 @@ Full Default Configuration
         <assetic:config
             debug="%kernel.debug%"
             use-controller="%kernel.debug%"
-            read-from="%kernel.root_dir%/../web"
-            write-to="%assetic.read_from%"
+            read-from="%assetic.read_from%"
+            write-to="%kernel.root_dir%/../web"
             java="/usr/bin/java"
             node="/usr/bin/node"
             sass="/usr/bin/sass"
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
index 800d409f226..da69bb0d964 100644
--- a/reference/dic_tags.rst
+++ b/reference/dic_tags.rst
@@ -392,72 +392,8 @@ form.type_extension
 
 **Purpose**: Create a custom "form extension"
 
-Form type extensions are a way for you took "hook into" the creation of
-any field in your form. For example, the addition of the CSRF token is done
-via a form type extension
-(:class:`Symfony\\Component\\Form\\Extension\\Csrf\\Type\\FormTypeCsrfExtension`).
-
-A form type extension can modify any part of any field in your form. To
-create a form type extension, first create a class that implements the
-:class:`Symfony\\Component\\Form\\FormTypeExtensionInterface` interface.
-For simplicity, you'll often extend an
-:class:`Symfony\\Component\\Form\\AbstractTypeExtension` class instead of
-the interface directly::
-
-    // src/Acme/MainBundle/Form/Type/MyFormTypeExtension.php
-    namespace Acme\MainBundle\Form\Type;
-
-    use Symfony\Component\Form\AbstractTypeExtension;
-
-    class MyFormTypeExtension extends AbstractTypeExtension
-    {
-        // ... fill in whatever methods you want to override
-        // like buildForm(), buildView(), finishView(), configureOptions()
-    }
-
-In order for Symfony to know about your form extension and use it, give
-it the ``form.type_extension`` tag:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        services:
-            main.form.type.my_form_type_extension:
-                class: Acme\MainBundle\Form\Type\MyFormTypeExtension
-                tags:
-                    - { name: form.type_extension, alias: field }
-
-    .. code-block:: xml
-
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            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="main.form.type.my_form_type_extension"
-                    class="Acme\MainBundle\Form\Type\MyFormTypeExtension">
-
-                    <tag name="form.type_extension" alias="field" />
-                </service>
-            </services>
-        </container>
-
-    .. code-block:: php
-
-        $container
-            ->register(
-                'main.form.type.my_form_type_extension',
-                'Acme\MainBundle\Form\Type\MyFormTypeExtension'
-            )
-            ->addTag('form.type_extension', array('alias' => 'field'))
-        ;
-
-The ``alias`` key of the tag is the type of field that this extension should
-be applied to. For example, to apply the extension to any form/field, use
-the "form" value.
+For details on creating Form type extensions, read the cookbook article:
+:doc:`/cookbook/form/create_form_type_extension`
 
 .. _reference-dic-type_guesser: