Merge branch '2.x'

FriendsOfSymfony · Apr 18, 2020 · fb3acbc · fb3acbc
2 parents da194fa + 06141a6
commit fb3acbc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/Resources/doc/annotations-reference.rst b/Resources/doc/annotations-reference.rst
@@ -83,28 +83,6 @@ View
 Routing
 -------
 
-Route prefix
-~~~~~~~~~~~~
-
-.. code-block:: php
-
-    use FOS\RestBundle\Controller\Annotations\Prefix;
-
-    /**
-     * @Prefix("")
-     */
-
-Route name prefix
-~~~~~~~~~~~~~~~~~
-
-.. code-block:: php
-
-    use FOS\RestBundle\Controller\Annotations\NamePrefix;
-
-    /**
-     * @NamePrefix("")
-     */
-
 Route
 ~~~~~
 

diff --git a/Resources/doc/request_body_converter_listener.rst b/Resources/doc/request_body_converter_listener.rst
@@ -21,13 +21,6 @@ To enable the Request body converter, add the following configuration:
         body_converter:
             enabled: true
 
-.. note::
-
-    You will probably want to disable the automatic route generation
-    (``@NoRoute``) for routes using the body converter, and instead define the
-    routes manually to avoid having the deserialized, type hinted objects
-    (``$post`` in this example) appear in the route as a parameter.
-
 Now, in the following example, the request body will be deserialized into a new
 instance of ``Post`` and injected into the ``$post`` variable: