Merge branch '4.0'

Author: wouterj

routing/custom_route_loader.rst

@@ -73,14 +73,14 @@ and configure the service and method to call:
 
     .. code-block:: yaml
 
-        # app/config/routing.yml
+        # config/routes.yaml
         admin_routes:
             resource: 'admin_route_loader:loadRoutes'
             type: service
 
     .. code-block:: xml
 
-        <!-- app/config/routing.xml -->
+        <!-- config/routes.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -92,7 +92,7 @@ and configure the service and method to call:
 
     .. code-block:: php
 
-        // app/config/routing.php
+        // config/routes.php
         use Symfony\Component\Routing\RouteCollection;
 
         $routes = new RouteCollection();
@@ -306,7 +306,7 @@ configuration file - you can call the
         {
             $routes = new RouteCollection();
 
-            $resource = '@ThirdPartyBundle/Resources/config/routing.yaml';
+            $resource = '@ThirdPartyBundle/Resources/config/routes.yaml';
             $type = 'yaml';
 
             $importedRoutes = $this->import($resource, $type);

security.rst

@@ -129,6 +129,15 @@ be fooled by the "Yes" next to Authenticated, you're just an anonymous user:
 
 You'll learn later how to deny access to certain URLs or controllers.
 
+.. note::
+
+    If you do not see toolbar, make sure you installed the :doc:`profiler </profile>`
+    using this command:
+
+    .. code-block:: terminal
+
+        $ composer require profiler --dev
+
 .. tip::
 
     Security is *highly* configurable and there's a

security/guard_authentication.rst

@@ -27,7 +27,7 @@ property they use to access their account via the API::
 
     /**
      * @ORM\Entity
-     * @ORM\Table(name="user")
+     * @ORM\Table(name="`user`")
      */
     class User implements UserInterface
     {
@@ -71,6 +71,13 @@ property they use to access their account via the API::
         // more getters/setters
     }
 
+.. caution::
+
+    In the example above, the table name is ``user``. This is a reserved SQL
+    keyword and `must be quoted with backticks`_ in Doctrine to avoid errors.
+    You might also change the table name (e.g. with ``app_users``) to solve
+    this issue.
+
 .. tip::
 
     This User doesn't have a password, but you can add a ``password`` property if
@@ -544,3 +551,5 @@ Frequently Asked Questions
     to actually authenticate the user. You can continue doing that (see previous
     question) or use the ``User`` object from FOSUserBundle and create your own
     authenticator(s) (just like in this article).
+
+.. _`must be quoted with backticks`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words