Merge branch '3.4' into 4.1

* 3.4:
  Update 3.3-di-changes.rst
  Fix link for webpack encore
  Missing root node in yaml example
  Fix a typo in security/impersonating_user.rst

Author: javiereguiluz

components/config/definition.rst

@@ -18,20 +18,21 @@ be a boolean value"):
 
 .. code-block:: yaml
 
-    auto_connect: true
-    default_connection: mysql
-    connections:
-        mysql:
-            host:     localhost
-            driver:   mysql
-            username: user
-            password: pass
-        sqlite:
-            host:     localhost
-            driver:   sqlite
-            memory:   true
-            username: user
-            password: pass
+    database:
+        auto_connect: true
+        default_connection: mysql
+        connections:
+            mysql:
+                host:     localhost
+                driver:   mysql
+                username: user
+                password: pass
+            sqlite:
+                host:     localhost
+                driver:   sqlite
+                memory:   true
+                username: user
+                password: pass
 
 When loading multiple configuration files, it should be possible to merge
 and overwrite some values. Other values should not be merged and stay as

deployment.rst

@@ -179,7 +179,7 @@ setup:
 * Running any database migrations
 * Clearing your APC cache
 * Add/edit CRON jobs
-* ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
+* :ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
 * Pushing assets to a CDN
 * ...
 

security/impersonating_user.rst

@@ -91,7 +91,7 @@ to show a link to exit impersonation:
 
 In some cases you may need to get the object that represents the impersonator
 user rather than the impersonated user. Use the following snippet to iterate
-over the user's roles until you find one that a ``SwitchUserRole`` object::
+over the user's roles until you find one that is a ``SwitchUserRole`` object::
 
     use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
     use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;

service_container/3.3-di-changes.rst

@@ -578,6 +578,14 @@ Start by updating the service ids to class names:
     Furthermore it is always recommended to check for definition existence
     using ``has()`` function.
 
+.. note::
+
+    If you get rid of deprecations and make your controllers extend from
+    ``AbstractController`` instead of ``Controller``, you can skip the rest of
+    this step because ``AbstractController`` doesn't provide a container where
+    you can get the services from. All services need to be injected as explained
+    in the :ref:`step 5 of this article <step-5>`.
+
 But, this change will break our app! The old service ids (e.g. ``app.github_notifier``)
 no longer exist. The simplest way to fix this is to find all your old service ids
 and update them to the new class id: ``app.github_notifier`` to ``App\Service\GitHubNotifier``.
@@ -708,6 +716,8 @@ will be used. If you *don't* have this, the auto-registration feature will try t
 register a third ``ApiClient`` service and use that for autowiring (which will fail,
 because the class has a non-autowireable argument).
 
+.. _step-5:
+
 Step 5) Cleanup!
 ~~~~~~~~~~~~~~~~