merged branch lyrixx/patch-2 (PR symfony#6898)

This PR was merged into the master branch. Commits ------- 9718c76 Updated UPGRADE-2.2.md for twig bridge section Discussion ---------- Updated UPGRADE-2.2.md for twig bridge section | Q             | A | ------------- | --- | Bug fix?      | yes | New feature?  | no | BC breaks?    | no | Deprecations? | no | Tests pass?   | yes | Fixed tickets | - | License       | MIT | Doc PR        | -

Author: fabpot

UPGRADE-2.2.md

@@ -15,8 +15,12 @@
 
  ```
  {% render controller('BlogBundle:Post:list', { 'limit': 2 }), { 'alt': 'BlogBundle:Post:error' } %}
+ {# Or: #}
+ {{ render(controller('BlogBundle:Post:list', { 'limit': 2 }), { 'alt': 'BlogBundle:Post:error'}) }}
  ```
 
+ Note: The function is the preferred way.
+
 ### HttpFoundation
 
  * The MongoDbSessionHandler default field names and timestamp type have changed.