merged branch vicb/patch-1 (PR #483)

This PR was merged into the master branch.

Commits
-------

214e3cf implement feedback
8363f4d Update UPGRADE-2.2.md

Discussion
----------

Update UPGRADE-2.2.md

---------------------------------------------------------------------------

by vicb at 2013-01-25T12:32:51Z

I did not mention rendering a controller specifically as I wanted to keep this simple. What do you think ?

---------------------------------------------------------------------------

by vicb at 2013-01-25T12:51:30Z

done

UPGRADE-2.2.md

@@ -1,6 +1,19 @@
 UPGRADE FROM 2.1 to 2.2
 =======================
 
+ * The ``_internal`` route is not used any more. It should then be removed from
+   both your routing and security configurations. A ``router_proxy`` key has
+   been added to the framework configuration and must be specified when ESI or
+   Hinclude are in use. No security configuration is required for this path as
+   by default ESI access is only permitted for trusted hosts and Hinclude access
+   uses an URL signing mechanism.
+
+   ```
+   framework:
+       # ...
+       router_proxy: { path: /_proxy }
+   ```
+
 Functional Tests
 ----------------