From d0c9ad92c9199a2c865588604647d77a0af97d25 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 1 Apr 2016 15:44:11 +0200
Subject: [PATCH 1/5] Added a caution note about REMOTE_USER and user
 impersonation

---
 cookbook/security/pre_authenticated.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cookbook/security/pre_authenticated.rst b/cookbook/security/pre_authenticated.rst
index e3501c54884..eaf6cef0ad6 100644
--- a/cookbook/security/pre_authenticated.rst
+++ b/cookbook/security/pre_authenticated.rst
@@ -151,3 +151,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.

From fbcfbb42c138ead0bc449c89b159d15732f96085 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 1 Apr 2016 15:49:47 +0200
Subject: [PATCH 2/5] Fixed a path

---
 cookbook/security/pre_authenticated.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/security/pre_authenticated.rst b/cookbook/security/pre_authenticated.rst
index eaf6cef0ad6..2d8e6202528 100644
--- a/cookbook/security/pre_authenticated.rst
+++ b/cookbook/security/pre_authenticated.rst
@@ -154,7 +154,7 @@ key in the ``remote_user`` firewall configuration.
 
 .. caution::
 
-    :doc:`User impersonation <cookbook/security/impersonating_user>` is not
+    :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.

From 80c26c15c5f31adbe52d21c6966ea9bfdb5ad232 Mon Sep 17 00:00:00 2001
From: Jules Pietri <heah@heahprod.com>
Date: Sat, 9 Apr 2016 13:55:31 +0200
Subject: [PATCH 3/5] [Form] fixed ChoiceType example in CollectionType

---
 reference/forms/types/collection.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index b5036c7785f..b2c8d8ce1a3 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -289,11 +289,12 @@ type::
         'type'   => 'choice',
         'options'  => array(
             'choices'  => array(
-                'nashville' => 'Nashville',
-                'paris'     => 'Paris',
-                'berlin'    => 'Berlin',
-                'london'    => 'London',
+                'Nashville' => 'nashville',
+                'Paris'     => 'paris',
+                'Berlin'    => 'berlin',
+                'London'    => 'london',
             ),
+            'choices_as_values' => true,
         ),
     ));
 

From 78ddfef1a7068cf4f75d09e5f997b3fad6ed4f09 Mon Sep 17 00:00:00 2001
From: Iltar van der Berg <ivanderberg@hostnet.nl>
Date: Mon, 11 Apr 2016 09:05:59 +0200
Subject: [PATCH 4/5] Fixed an array notation in comment (serializer.rst)

---
 components/serializer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/serializer.rst b/components/serializer.rst
index 80ca7df9041..9daf8c4c26c 100644
--- a/components/serializer.rst
+++ b/components/serializer.rst
@@ -300,7 +300,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'),

From 3d2630353ebc03db0ce6dfded166a06d29219b82 Mon Sep 17 00:00:00 2001
From: autiquet axel <axel.autiquet@gmail.com>
Date: Wed, 6 Apr 2016 17:22:27 +0200
Subject: [PATCH 5/5] Fix form/validation directory path

---
 components/form/introduction.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/form/introduction.rst b/components/form/introduction.rst
index d2c2189c7a6..8ecfae5b692 100644
--- a/components/form/introduction.rst
+++ b/components/form/introduction.rst
@@ -318,9 +318,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();