From 4d40b115e758559f26f0f1a6d11d98969cd0abf6 Mon Sep 17 00:00:00 2001
From: Benjamin Grandfond <benjaming@theodo.fr>
Date: Thu, 20 Dec 2012 11:05:55 +0100
Subject: [PATCH] Add notes about kernel.trusted_proxies parameter

---
 UPGRADE-2.2.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/UPGRADE-2.2.md b/UPGRADE-2.2.md
index 4fbfe5cc64..26b03c1183 100644
--- a/UPGRADE-2.2.md
+++ b/UPGRADE-2.2.md
@@ -362,3 +362,24 @@
    protected $gender;
    ```
 
+### FrameworkBundle
+
+#### Configuration
+
+ * The 2.2 version introduces a new parameter ```trusted_proxies``` that replaces ```trust_proxy_headers``` in the framework configuration.
+
+   Before:
+
+   ```
+   # app/config/config.yml
+   framework:
+       trust_proxy_headers: false
+   ```
+
+   After:
+
+   ```
+   # app/config/config.yml
+   framework:
+      trusted_proxies: []
+   ```