Merge branch '4.0'

wouterj · wouterj · commit e98f0a1391b5 · 2017-12-31T13:19:22.000+01:00
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
@@ -102,7 +102,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
 -------------------------------------------------------------
 
diff --git a/reference/forms/types/datetime.rst b/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',
