Merge branch '3.3' into 3.4

Author: wouterj

configuration/micro_kernel_trait.rst

@@ -104,7 +104,6 @@ that define your bundles, your services and your routes:
     ``RouteCollectionBuilder`` has methods that make adding routes in PHP more
     fun. You can also load external routing files (shown below).
 
-
 Advanced Example: Twig, Annotations and the Web Debug Toolbar
 -------------------------------------------------------------
 

reference/forms/types/datetime.rst

@@ -83,7 +83,7 @@ as a series of ``select`` boxes. When the placeholder value is a string,
 it will be used as the **blank value** of all select boxes::
 
     use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-    
+
     $builder->add('startDateTime', DateTimeType::class, array(
         'placeholder' => 'Select a value',
     ));
@@ -92,7 +92,7 @@ Alternatively, you can use an array that configures different placeholder
 values for the year, month, day, hour, minute and second fields::
 
     use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-    
+
     $builder->add('startDateTime', DateTimeType::class, array(
         'placeholder' => array(
             'year' => 'Year', 'month' => 'Month', 'day' => 'Day',

security/custom_provider.rst

@@ -9,7 +9,7 @@ When a user submits a username and password, the authentication layer asks
 the configured user provider to return a user object for a given username.
 Symfony then checks whether the password of this user is correct and generates
 a security token so the user stays authenticated during the current session.
-Out of the box, Symfony has four user providers: ``memory``, ``entity``, 
+Out of the box, Symfony has four user providers: ``memory``, ``entity``,
 ``ldap`` and ``chain``. In this entry you'll see how you can create your
 own user provider, which could be useful if your users are accessed via a
 custom database, a file, or - as shown in this example - a web service.