Merge branch '3.4' into 4.4

* 3.4:
  Adding `path`
  Fix term
  Change char to varchar type
  Use redirectToRoute
  [#13980] add annotation config example
  [Validator] Made the code sample more explicit with accepted values
  Update voters.rst
  Update voters.rst
  Update voters.rst
  Update security/voters.rst
  Update voters.rst
  [#13554] Slightly reworded the tip
  Update voters.rst
  Explaining controllers as viable alternative

Author: xabbuh

components/http_foundation.rst

@@ -621,7 +621,7 @@ or change its ``Content-Disposition``::
         'filename.txt'
     );
 
-It is possible to delete the file after the request is sent with the
+It is possible to delete the file after the response is sent with the
 :method:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse::deleteFileAfterSend` method.
 Please note that this will not work when the ``X-Sendfile`` header is set.
 

controller/upload_file.rst

@@ -170,7 +170,7 @@ Finally, you need to update the code of the controller that handles the form::
 
                 // ... persist the $product variable or any other work
 
-                return $this->redirect($this->generateUrl('app_product_list'));
+                return $this->redirectToRoute('app_product_list');
             }
 
             return $this->render('product/new.html.twig', [

reference/configuration/security.rst

@@ -577,6 +577,14 @@ The user is considered to have changed when the user class implements
 required by the :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface`
 (like the username, password or salt) changes.
 
+``path``
+~~~~~~~~
+
+**type**: ``string`` **default**: ``/logout``
+
+The path which triggers logout. If you change it from the default value ``/logout``,
+you need to set up a route with a matching path.
+
 success_handler
 ~~~~~~~~~~~~~~~
 

reference/constraints/Collection.rst

@@ -209,7 +209,7 @@ you can do the following:
              *     }
              * )
              */
-            protected $profileData = ['personal_email'];
+            protected $profileData = ['personal_email' => 'email@example.com'];
         }
 
     .. code-block:: yaml

security/remember_me.rst

@@ -241,7 +241,7 @@ so ``DoctrineTokenProvider`` can store the tokens:
 
     CREATE TABLE `rememberme_token` (
         `series`   char(88)     UNIQUE PRIMARY KEY NOT NULL,
-        `value`    char(88)     NOT NULL,
+        `value`    varchar(88)  NOT NULL,
         `lastUsed` datetime     NOT NULL,
         `class`    varchar(100) NOT NULL,
         `username` varchar(200) NOT NULL

security/voters.rst

@@ -6,19 +6,30 @@
 How to Use Voters to Check User Permissions
 ===========================================
 
-Security voters are the most granular way of checking permissions (e.g. "can this
-specific user edit the given item?"). This article explains voters in detail.
+Voters are Symfony's most powerful way of managing permissions. They allow you
+to centralize all permission logic, then reuse them in many places.
+
+However, if you don't reuse permissions or your rules are basic, you can always
+put that logic directly into your controller instead. Here's an example how
+this could look like, if you want to make a route accessible to the "owner" only::
+
+    // src/AppBundle/Controller/PostController.php
+    // ...
+
+    if ($post->getOwner() !== $this->getUser()) {
+        throw $this->createAccessDeniedException();
+    }
+
+In that sense, the following example used throughout this page is a minimal
+example for voters.
 
 .. tip::
 
     Take a look at the
     :doc:`authorization </components/security/authorization>`
     article for an even deeper understanding on voters.
 
-How Symfony Uses Voters
------------------------
-
-In order to use voters, you have to understand how Symfony works with them.
+Here's how Symfony works with voters:
 All voters are called each time you use the ``isGranted()`` method on Symfony's
 authorization checker or call ``denyAccessUnlessGranted()`` in a controller (which
 uses the authorization checker), or by