Update branch alias and fix outdated and irrelevant doc

Author: Tobion

CHANGELOG.md

@@ -5,7 +5,8 @@ CHANGELOG
 -----
 
 * [BC BREAK] The `@Route` annotation and all its children no longer extend SensioFrameworkExtraBundle's annotation.
-  The main effect is that `@Route::$service` is no longer available.
+  The main effect is that `@Route::$service` is no longer available. Instead, define your controllers using the FQCN
+  as service IDs or create an alias in the container using the FQCN.
 
 2.3.1
 -----

Resources/doc/annotations-reference.rst

@@ -112,21 +112,7 @@ Route
 
 RestBundle extends the `@Route Symfony annotation`_ from Symfony.
 
-@Delete @Get @Head @Link @Patch @Post @Put @Unlink @Lock @Unlock @PropFind @PropPatch @Move @Mkcol @Copy have the same options as @Route.
-
-When using ``symfony/routing:>=2.4`` (or the full framework) you have access to
-the expression language component and can add conditions to your routing
-configuration with annotations (see `Routing Conditions`_).
-
-Example syntax:
-
-.. code-block:: php
-
-    use FOS\RestBundle\Controller\Annotations\Route;
-
-    /**
-    * @Route("", condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'")
-    */
+@Delete @Get @Head @Link @Patch @Post @Put @Unlink @Lock @Unlock @PropFind @PropPatch @Move @Mkcol @Copy are shortcuts to define
+routes limited to a specific HTTP method. They have the same options as @Route.
 
 .. _`@Route Symfony annotation`: https://symfony.com/doc/current/routing.html
-.. _`Routing Conditions`: http://symfony.com/doc/current/book/routing.html#book-routing-conditions

composer.json

@@ -65,7 +65,7 @@
         "psr/http-message": "^1.0"
     },
     "suggest": {
-        "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ^3.0",
+        "sensio/framework-extra-bundle": "Add support for the request body converter and the view response listener, requires ^3.0",
         "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^1.0",
         "symfony/expression-language": "Add support for using the expression language in the routing, requires ^2.7|^3.0",
         "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ^2.7|^3.0",
@@ -78,7 +78,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3-dev"
+            "dev-master": "2.4-dev"
         }
     }
 }