updated CHANGELOG and UPGRADE files

UPGRADE-2.2.md

@@ -14,11 +14,9 @@
    After:
 
    ```
-   {% render url('post_list', { 'limit': 2 }), { 'alt': 'BlogBundle:Post:error' } %}
+   {% render controller('BlogBundle:Post:list', { 'limit': 2 }), { 'alt': 'BlogBundle:Post:error' } %}
    ```
 
-   where `post_list` is the route name for the `BlogBundle:Post:list` controller.
-
 ### HttpFoundation
 
  * The MongoDbSessionHandler default field names and timestamp type have changed.
@@ -409,7 +407,12 @@
    <?php echo $view['actions']->render($view['router']->generate('post_list', array('limit' => 2)), array('alt' => 'BlogBundle:Post:error')) ?>
    ```
 
-   where `post_list` is the route name for the `BlogBundle:Post:list` controller.
+   where `post_list` is the route name for the `BlogBundle:Post:list`
+   controller, or if you don't want to create a route:
+
+   ```
+   <?php echo $view['actions']->render(new ControllerReference('BlogBundle:Post:list', array('limit' => 2)), array('alt' => 'BlogBundle:Post:error')) ?>
+   ```
 
 #### Configuration
 

src/Symfony/Bridge/Twig/CHANGELOG.md

@@ -4,8 +4,10 @@ CHANGELOG
 2.2.0
 -----
 
- * [BC BREAK] restricted the `render` tag to only accept URIs as reference (the signature changed)
- * added a render function to render a request
+ * added a `controller` function to help generating controller references
+ * added a `render_esi` and a `render_hinclude` function
+ * [BC BREAK] restricted the `render` tag to only accept URIs or ControllerReference instances (the signature changed)
+ * added a `render` function to render a request
  * The `app` global variable is now injected even when using the twig service directly.
  * Added an optional parameter to the `path` and `url` function which allows to generate
    relative paths (e.g. "../parent-file") and scheme-relative URLs (e.g. "//example.com/dir/file").

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -4,11 +4,16 @@ CHANGELOG
 2.2.0
 -----
 
- * [BC BREAK] restricted the `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` method to only accept URIs as reference
+ * added a new `uri_signer` service to help sign URIs
+ * deprecated `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` and `Symfony\Bundle\FrameworkBundle\HttpKernel::forward()`
+ * deprecated the `Symfony\Bundle\FrameworkBundle\HttpKernel` class in favor of `Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel`
+ * added support for adding new HTTP content rendering strategies (like ESI and Hinclude)
+   in the DIC via the `kernel.content_renderer_strategy` tag
+ * [BC BREAK] restricted the `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` method to only accept URIs or ControllerReference instances
    * `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` method signature changed and the first argument
-     must now be a URI (the `generateInternalUri()` method was removed)
-   * The internal routes have been removed (`Resources/config/routing/internal.xml`)
-   * The `render` method of the `actions` templating helper signature and arguments changed:
+     must now be a URI or a ControllerReference instance (the `generateInternalUri()` method was removed)
+   * The internal routes (`Resources/config/routing/internal.xml`) have been replaced with a new proxy route (`Resources/config/routing/proxy.xml`)
+   * The `render` method of the `actions` templating helper signature and arguments changed
  * replaced Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver by Symfony\Component\HttpKernel\Controller\TraceableControllerResolver
  * replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
  * added Client::enableProfiler()

src/Symfony/Component/HttpFoundation/CHANGELOG.md

@@ -4,6 +4,8 @@ CHANGELOG
 2.2.0
 -----
 
+ * added Request::getTrustedProxies()
+ * deprecated Request::isProxyTrusted()
  * added a IpUtils class to check if an IP belongs to a CIDR
  * added Request::getRealMethod() to get the "real" HTTP method (getMethod() returns the "intended" HTTP method)
  * disabled _method request parameter support by default (call Request::enableHttpMethodParameterOverride() to enable it)

src/Symfony/Component/HttpFoundation/Request.php

@@ -527,6 +527,8 @@ class Request
      * false otherwise.
      *
      * @return boolean
+     *
+     * @deprecated Deprecated since version 2.2, to be removed in 2.3. Use getTrustedProxies instead.
      */
     public static function isProxyTrusted()
     {

src/Symfony/Component/HttpKernel/CHANGELOG.md

@@ -4,6 +4,11 @@ CHANGELOG
 2.2.0
 -----
 
+ * added Symfony\Component\HttpKernel\UriSigner
+ * added Symfony\Component\HttpKernel\HttpContentRenderer and rendering strategies (in Symfony\Component\HttpKernel\RenderingStrategy)
+ * added Symfony\Component\HttpKernel\EventListener\RouterProxyListener
+ * added Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel
+ * added ControllerReference to create reference of Controllers (used in the HttpContentRenderer class)
  * [BC BREAK] renamed TimeDataCollector::getTotalTime() to
    TimeDataCollector::getDuration()
  * updated the MemoryDataCollector to include the memory used in the