diff --git a/components/form/introduction.rst b/components/form/introduction.rst
index aacfbd8c215..6ff900cddfa 100644
--- a/components/form/introduction.rst
+++ b/components/form/introduction.rst
@@ -315,9 +315,8 @@ Your integration with the Validation component will look something like this::
     use Symfony\Component\Validator\Validation;
 
     $vendorDir = realpath(__DIR__.'/../vendor');
-    $vendorFormDir = $vendorDir.'/symfony/form/Symfony/Component/Form';
-    $vendorValidatorDir =
-        $vendorDir.'/symfony/validator/Symfony/Component/Validator';
+    $vendorFormDir = $vendorDir.'/symfony/form';
+    $vendorValidatorDir = $vendorDir.'/symfony/validator';
 
     // create the validator - details will vary
     $validator = Validation::createValidator();
diff --git a/components/serializer.rst b/components/serializer.rst
index 2af0ad3fb96..be53706a54e 100644
--- a/components/serializer.rst
+++ b/components/serializer.rst
@@ -296,7 +296,7 @@ You are now able to serialize only attributes in the groups you want::
     $serializer = new Serializer(array($normalizer));
 
     $data = $serializer->normalize($obj, null, array('groups' => array('group1')));
-    // $data = ['foo' => 'foo'];
+    // $data = array('foo' => 'foo');
 
     $obj2 = $serializer->denormalize(
         array('foo' => 'foo', 'bar' => 'bar'),
diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst
index c07e1f91d4a..17ff7de543f 100644
--- a/contributing/code/core_team.rst
+++ b/contributing/code/core_team.rst
@@ -51,8 +51,19 @@ Active Core Members
   * **Romain Neutron** (`romainneutron`_) can merge into the
     Process_ component;
 
+<<<<<<< HEAD
   * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
     component, the VarDumper_ component and the DebugBundle_;
+=======
+<<<<<<< HEAD
+  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
+    component, the VarDumper_ component and the DebugBundle_;
+=======
+  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
+    Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
+    the DebugBundle_;
+>>>>>>> 2.3
+>>>>>>> 2.7
 
   * **Christophe Coevoet** (`stof`_) can merge into the BrowserKit_,
     Config_, Console_, DependencyInjection_, DomCrawler_, EventDispatcher_,
diff --git a/cookbook/security/pre_authenticated.rst b/cookbook/security/pre_authenticated.rst
index 82adbd3f8fd..37b177ccd6b 100644
--- a/cookbook/security/pre_authenticated.rst
+++ b/cookbook/security/pre_authenticated.rst
@@ -148,3 +148,10 @@ key in the ``remote_user`` firewall configuration.
     Just like for X509 authentication, you will need to configure a "user provider".
     See :ref:`the previous note <cookbook-security-pre-authenticated-user-provider-note>`
     for more information.
+
+.. caution::
+
+    :doc:`User impersonation </cookbook/security/impersonating_user>` is not
+    compatible with ``REMOTE_USER`` based authentication. The reason is that
+    impersonation requires the authentication state to be maintained server-side
+    but ``REMOTE_USER`` information is sent by the browser in each request.
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index 86a112dc6b2..86589df9fc8 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -295,11 +295,12 @@ type::
         'entry_type'   => ChoiceType::class,
         'entry_options'  => array(
             'choices'  => array(
-                'nashville' => 'Nashville',
-                'paris'     => 'Paris',
-                'berlin'    => 'Berlin',
-                'london'    => 'London',
+                'Nashville' => 'nashville',
+                'Paris'     => 'paris',
+                'Berlin'    => 'berlin',
+                'London'    => 'london',
             ),
+            'choices_as_values' => true,
         ),
     ));