diff --git a/controller/error_pages.rst b/controller/error_pages.rst
index f713b909035..fff0e307eac 100644
--- a/controller/error_pages.rst
+++ b/controller/error_pages.rst
@@ -157,7 +157,7 @@ automatically when installing ``symfony/framework-bundle``):
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="@FrameworkBundle/Resources/config/routing/errors.xml" prefix="/_error"/>
         </routes>
@@ -165,7 +165,7 @@ automatically when installing ``symfony/framework-bundle``):
     .. code-block:: php
 
         // config/routes/dev/framework.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('@FrameworkBundle/Resources/config/routing/errors.xml')
diff --git a/controller/service.rst b/controller/service.rst
index 77020bab590..d9dcbcfdef8 100644
--- a/controller/service.rst
+++ b/controller/service.rst
@@ -54,7 +54,7 @@ a service like: ``App\Controller\HelloController::index``:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="hello" path="/hello" controller="App\Controller\HelloController::index" methods="GET"/>
 
@@ -64,7 +64,7 @@ a service like: ``App\Controller\HelloController::index``:
 
         // config/routes.php
         use App\Controller\HelloController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('hello', '/hello')
@@ -115,7 +115,7 @@ which is a common practice when following the `ADR pattern`_
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="hello" path="/hello/{name}">
                 <default key="_controller">app.hello_controller</default>
diff --git a/routing.rst b/routing.rst
index f5647e85fa6..57c005aee0e 100644
--- a/routing.rst
+++ b/routing.rst
@@ -109,7 +109,7 @@ the ``BlogController``:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <!-- the controller value has the format 'controller_class::method_name' -->
             <route id="blog_list" path="/blog"
@@ -124,7 +124,7 @@ the ``BlogController``:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_list', '/blog')
@@ -193,7 +193,7 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="api_post_show" path="/api/posts/{id}"
                 controller="App\Controller\BlogApiController::show"
@@ -208,7 +208,7 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
 
         // config/routes.php
         use App\Controller\BlogApiController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('api_post_show', '/api/posts/{id}')
@@ -282,7 +282,7 @@ arbitrary matching logic:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="contact" path="/contact" controller="App\Controller\DefaultController::contact">
                 <condition>context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'</condition>
@@ -295,7 +295,7 @@ arbitrary matching logic:
 
         // config/routes.php
         use App\Controller\DefaultController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('contact', '')
@@ -429,7 +429,7 @@ defined as ``/blog/{slug}``:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_show" path="/blog/{slug}"
                    controller="App\Controller\BlogController::show"/>
@@ -439,7 +439,7 @@ defined as ``/blog/{slug}``:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_show', '/blog/{slug}')
@@ -518,7 +518,7 @@ the ``{page}`` parameter using the ``requirements`` option:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_list" path="/blog/{page}" controller="App\Controller\BlogController::list">
                 <requirement key="page">\d+</requirement>
@@ -532,7 +532,7 @@ the ``{page}`` parameter using the ``requirements`` option:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_list', '/blog/{page}')
@@ -615,7 +615,7 @@ concise, but it can decrease route readability when requirements are complex:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_list" path="/blog/{page<\d+>}"
                    controller="App\Controller\BlogController::list"/>
@@ -627,7 +627,7 @@ concise, but it can decrease route readability when requirements are complex:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_list', '/blog/{page<\d+>}')
@@ -690,7 +690,7 @@ other configuration formats they are defined with the ``defaults`` option:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_list" path="/blog/{page}" controller="App\Controller\BlogController::list">
                 <default key="page">1</default>
@@ -705,7 +705,7 @@ other configuration formats they are defined with the ``defaults`` option:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_list', '/blog/{page}')
@@ -769,7 +769,7 @@ parameter:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_list" path="/blog/{page <\d+>?1}"
                    controller="App\Controller\BlogController::list"/>
@@ -781,7 +781,7 @@ parameter:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_list', '/blog/{page<\d+>?1}')
@@ -917,7 +917,7 @@ and in route imports. Symfony defines some special attributes with the same name
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="article_search"
                 path="/articles/{_locale}/search.{_format}"
@@ -994,7 +994,7 @@ the controllers of the routes:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_index" path="/blog/{page}" controller="App\Controller\BlogController::index">
                 <default key="page">1</default>
@@ -1006,7 +1006,7 @@ the controllers of the routes:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_index', '/blog/{page}')
@@ -1066,7 +1066,7 @@ A possible solution is to change the parameter requirements to be more permissiv
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="share" path="/share/{token}" controller="App\Controller\DefaultController::share">
                 <requirement key="token">.+</requirement>
@@ -1077,7 +1077,7 @@ A possible solution is to change the parameter requirements to be more permissiv
 
         // config/routes.php
         use App\Controller\DefaultController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('share', '/share/{token}')
@@ -1175,7 +1175,7 @@ the common configuration using options when importing the routes.
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <!--
                 the 'prefix' value is added to the beginning of all imported route URLs
@@ -1203,7 +1203,7 @@ the common configuration using options when importing the routes.
     .. code-block:: php
 
         // config/routes/annotations.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             // use the optional fifth argument of import() to exclude some files
@@ -1292,7 +1292,8 @@ in the main article about Symfony templates.
 Redirecting to URLs and Routes Directly from a Route
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Use the ``RedirectController`` to redirect to other routes and URLs:
+Use the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController`
+to redirect to other routes and URLs:
 
 .. configuration-block::
 
@@ -1301,28 +1302,27 @@ Use the ``RedirectController`` to redirect to other routes and URLs:
         # config/routes.yaml
         doc_shortcut:
             path: /doc
-            controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController
+            redirect_to_route: 'doc_page'
+
+            # redirections are temporary by default (code 302) but you can make them permanent (code 301)
+            permanent: true
+            # add this to keep the original query string parameters when redirecting
+            keepQueryParams: true
+            # add this to keep the HTTP method when redirecting. The redirect status changes
+            # * for temporary redirects, it uses the 307 status code instead of 302
+            # * for permanent redirects, it uses the 308 status code instead of 301
+            keepRequestMethod: true
+
+            # optionally you can define some arguments passed to the route
             defaults:
-                route: 'doc_page'
-                # optionally you can define some arguments passed to the route
                 page: 'index'
                 version: 'current'
-                # redirections are temporary by default (code 302) but you can make them permanent (code 301)
-                permanent: true
-                # add this to keep the original query string parameters when redirecting
-                keepQueryParams: true
-                # add this to keep the HTTP method when redirecting. The redirect status changes
-                # * for temporary redirects, it uses the 307 status code instead of 302
-                # * for permanent redirects, it uses the 308 status code instead of 301
-                keepRequestMethod: true
 
         legacy_doc:
             path: /legacy/doc
-            controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController
-            defaults:
-                # this value can be an absolute path or an absolute URL
-                path: 'https://legacy.example.com/doc'
-                permanent: true
+            # this value can be an absolute path or an absolute URL
+            redirect_to_url: 'https://legacy.example.com/doc'
+            permanent: true
 
     .. code-block:: xml
 
@@ -1331,75 +1331,134 @@ Use the ``RedirectController`` to redirect to other routes and URLs:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
-
-            <route id="doc_shortcut" path="/doc"
-                   controller="Symfony\Bundle\FrameworkBundle\Controller\RedirectController">
-                <default key="route">doc_page</default>
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
+
+            <redirect-route id="doc_shortcut" path="/doc"
+                    redirect-to-route="doc_page"
+                    <!-- redirections are temporary by default (code 302) but you can make them permanent (code 301)-->
+                    permanent="true"
+                    <!-- add this to keep the original query string parameters when redirecting -->
+                    keepQueryParams="true">
+                    <!-- add this to keep the HTTP method when redirecting. The redirect status changes:
+                         * for temporary redirects, it uses the 307 status code instead of 302
+                         * for permanent redirects, it uses the 308 status code instead of 301 -->
+                    keepRequestMethod="true">
                 <!-- optionally you can define some arguments passed to the route -->
                 <default key="page">index</default>
                 <default key="version">current</default>
-                <!-- redirections are temporary by default (code 302) but you can make them permanent (code 301)-->
-                <default key="permanent">true</default>
-                <!-- add this to keep the original query string parameters when redirecting -->
-                <default key="keepQueryParams">true</default>
-                <!-- add this to keep the HTTP method when redirecting. The redirect status changes:
-                     * for temporary redirects, it uses the 307 status code instead of 302
-                     * for permanent redirects, it uses the 308 status code instead of 301 -->
-                <default key="keepRequestMethod">true</default>
-            </route>
+            </redirect-route>
 
-            <route id="legacy_doc" path="/legacy/doc"
-                   controller="Symfony\Bundle\FrameworkBundle\Controller\RedirectController">
+            <url-redirect-route id="legacy_doc" path="/legacy/doc"
                 <!-- this value can be an absolute path or an absolute URL -->
-                <default key="path">https://legacy.example.com/doc</default>
+                redirect-to-url="https://legacy.example.com/doc"
                 <!-- redirections are temporary by default (code 302) but you can make them permanent (code 301)-->
-                <default key="permanent">true</default>
-            </route>
+                permanent="true">
+            </url-redirect-route>
         </routes>
 
     .. code-block:: php
 
         // config/routes.php
         use App\Controller\DefaultController;
-        use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('doc_shortcut', '/doc')
-                ->controller(RedirectController::class)
-                 ->defaults([
-                    'route' => 'doc_page',
-                    // optionally you can define some arguments passed to the template
+                ->redirectToRoute('doc_page')
+
+                // redirections are temporary by default (code 302) but you can make them permanent (code 301)
+                ->permanent()
+
+                // add this to keep the original query string parameters when redirecting
+                ->keepQueryParams()
+
+                // add this to keep the HTTP method when redirecting. The redirect status changes:
+                // * for temporary redirects, it uses the 307 status code instead of 302
+                // * for permanent redirects, it uses the 308 status code instead of 301
+                ->keepRequestMethod()
+
+                // optionally you can define some arguments passed to the template
+                ->defaults([
                     'page' => 'index',
                     'version' => 'current',
-                    // redirections are temporary by default (code 302) but you can make them permanent (code 301)
-                    'permanent' => true,
-                    // add this to keep the original query string parameters when redirecting
-                    'keepQueryParams' => true,
-                    // add this to keep the HTTP method when redirecting. The redirect status changes:
-                    // * for temporary redirects, it uses the 307 status code instead of 302
-                    // * for permanent redirects, it uses the 308 status code instead of 301
-                    'keepRequestMethod' => true,
                 ])
             ;
 
             $routes->add('legacy_doc', '/legacy/doc')
-                ->controller(RedirectController::class)
-                 ->defaults([
-                    // this value can be an absolute path or an absolute URL
-                    'path' => 'https://legacy.example.com/doc',
-                    // redirections are temporary by default (code 302) but you can make them permanent (code 301)
-                    'permanent' => true,
-                ])
+                // this value can be an absolute path or an absolute URL
+                ->redirectToUrl('https://legacy.example.com/doc')
+
+                // redirections are temporary by default (code 302) but you can make them permanent (code 301)
+                ->permanent()
             ;
         };
 
+.. versionadded:: 5.1
+
+    This short syntax was introduced in Symfony 5.1. Before you had to
+    define the controller and specific route attributes using ``defaults``.
+
 .. tip::
 
     Symfony also provides some utilities to
     :ref:`redirect inside controllers <controller-redirect>`
 
+Discarding Routes From Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes, you may want to discard a route from a vendor collection, or notify
+search engines that a page is gone:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/routes.yaml
+        # if the same name was used by a route imported before it will be overridden
+        discarded_route:
+            path: /unwanted
+            gone: true
+            # gone routes are temporary by default (code 404) but you can make them permanent (code 410)
+            permanent: true
+
+    .. code-block:: xml
+
+        <!-- config/routes.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <routes xmlns="http://symfony.com/schema/routing"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
+
+            <!-- if the same id was used by a route imported before it will be overridden -->
+            <gone-route id="discarded_route" path="/unwanted"
+                    permanent="true">
+                    <!-- gone routes are temporary by default (code 404) but you can make them permanent (code 410) -->
+            </gone-route>
+
+        </routes>
+
+    .. code-block:: php
+
+        // config/routes.php
+        use App\Controller\DefaultController;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
+
+        return function (RoutingConfigurator $routes) {
+            // if the same name was used by a route imported before it will be overridden
+            $routes->add('discarded_route', '/unwanted')
+                ->gone()
+
+                // gone routes are temporary by default (code 404) but you can make them permanent (code 410)
+                ->permanent()
+            ;
+        };
+
+.. versionadded:: 5.1
+
+    This short syntax was introduced in Symfony 5.1. Before you had to
+    define the controller and specific route attributes using ``defaults``.
+
 .. _routing-trailing-slash-redirection:
 
 Redirecting URLs with Trailing Slashes
@@ -1477,7 +1536,7 @@ host name:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="mobile_homepage"
                 path="/"
@@ -1491,7 +1550,7 @@ host name:
 
         // config/routes.php
         use App\Controller\MainController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('mobile_homepage', '/')
@@ -1566,7 +1625,7 @@ multi-tenant applications) and these parameters can be validated too with
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="mobile_homepage"
                 path="/"
@@ -1583,7 +1642,7 @@ multi-tenant applications) and these parameters can be validated too with
 
         // config/routes.php
         use App\Controller\MainController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('mobile_homepage', '/')
@@ -1674,7 +1733,7 @@ avoids the need for duplicating routes, which also reduces the potential bugs:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="about_us" controller="App\Controller\CompanyController::about">
                 <path locale="en">/about-us</path>
@@ -1686,7 +1745,7 @@ avoids the need for duplicating routes, which also reduces the potential bugs:
 
         // config/routes.php
         use App\Controller\CompanyController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('about_us', [
@@ -1729,7 +1788,7 @@ with a locale. This can be done by defining a different prefix for each locale
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="../../src/Controller/" type="annotation">
                 <!-- don't prefix URLs for English, the default locale -->
@@ -1741,7 +1800,7 @@ with a locale. This can be done by defining a different prefix for each locale
     .. code-block:: php
 
         // config/routes/annotations.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('../../src/Controller/', 'annotation')
@@ -2098,7 +2157,7 @@ each route explicitly:
 
         // config/routes.php
         use App\Controller\SecurityController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('login', '/login')
@@ -2147,7 +2206,7 @@ defined as annotations:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="../../src/Controller/" type="annotation">
                 <default key="schemes">HTTPS</default>
@@ -2157,7 +2216,7 @@ defined as annotations:
     .. code-block:: php
 
         // config/routes/annotations.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('../../src/Controller/', 'annotation')
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
index 8a66b15e38f..89cf108a5a2 100644
--- a/routing/custom_route_loader.rst
+++ b/routing/custom_route_loader.rst
@@ -46,7 +46,7 @@ Symfony provides several route loaders for the most common needs:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <!-- loads routes from the given routing file stored in some bundle -->
             <import resource="@AcmeBundle/Resources/config/routing.yaml"/>
@@ -64,7 +64,7 @@ Symfony provides several route loaders for the most common needs:
     .. code-block:: php
 
         // config/routes.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             // loads routes from the given routing file stored in some bundle
@@ -138,7 +138,7 @@ Take these lines from the ``routes.yaml``:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="../src/Controller" type="annotation"/>
         </routes>
@@ -146,7 +146,7 @@ Take these lines from the ``routes.yaml``:
     .. code-block:: php
 
         // config/routes.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('../src/Controller', 'annotation');
@@ -192,7 +192,7 @@ and configure the service and method to call:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="admin_route_loader::loadRoutes" type="service"/>
         </routes>
@@ -200,7 +200,7 @@ and configure the service and method to call:
     .. code-block:: php
 
         // config/routes.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('admin_route_loader::loadRoutes', 'service');
@@ -370,7 +370,7 @@ What remains to do is adding a few lines to the routing configuration:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <import resource="." type="extra"/>
         </routes>
@@ -378,7 +378,7 @@ What remains to do is adding a few lines to the routing configuration:
     .. code-block:: php
 
         // config/routes.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->import('.', 'extra');
diff --git a/security.rst b/security.rst
index ec7c17dcb29..38a8b2ba5c7 100644
--- a/security.rst
+++ b/security.rst
@@ -855,7 +855,7 @@ Next, you'll need to create a route for this URL (but not a controller):
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="app_logout" path="/logout" methods="GET"/>
         </routes>
@@ -863,7 +863,7 @@ Next, you'll need to create a route for this URL (but not a controller):
     ..  code-block:: php
 
         // config/routes.php
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('logout', '/logout')
diff --git a/security/form_login.rst b/security/form_login.rst
index f7763ce8094..76713414a19 100644
--- a/security/form_login.rst
+++ b/security/form_login.rst
@@ -122,7 +122,7 @@ configuration (``login``):
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="GET|POST"/>
         </routes>
@@ -131,7 +131,7 @@ configuration (``login``):
 
         // config/routes.php
         use App\Controller\SecurityController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('login', '/login')
diff --git a/security/json_login_setup.rst b/security/json_login_setup.rst
index 060821704e2..8b8b96b81a8 100644
--- a/security/json_login_setup.rst
+++ b/security/json_login_setup.rst
@@ -102,7 +102,7 @@ The next step is to configure a route in your app matching this path:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="login" path="/login" controller="App\Controller\SecurityController::login" methods="POST"/>
         </routes>
@@ -111,7 +111,7 @@ The next step is to configure a route in your app matching this path:
 
         // config/routes.php
         use App\Controller\SecurityController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('login', '/login')
diff --git a/templates.rst b/templates.rst
index 7ab528b2ec7..aea86b8a091 100644
--- a/templates.rst
+++ b/templates.rst
@@ -230,7 +230,7 @@ Consider the following routing configuration:
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="blog_index"
                 path="/"
@@ -245,7 +245,7 @@ Consider the following routing configuration:
 
         // config/routes.php
         use App\Controller\BlogController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('blog_index', '/')
@@ -457,8 +457,8 @@ Rendering a Template Directly from a Route
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Although templates are usually rendered in controllers and services, you can
-render static pages that don't need any variables directly from the route
-definition. Use the special :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\TemplateController`
+render static pages from the route definition. Use the special
+:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\TemplateController`
 provided by Symfony:
 
 .. configuration-block::
@@ -468,22 +468,20 @@ provided by Symfony:
         # config/routes.yaml
         acme_privacy:
             path:          /privacy
-            controller:    Symfony\Bundle\FrameworkBundle\Controller\TemplateController
-            defaults:
-                # the path of the template to render
-                template:  'static/privacy.html.twig'
+            # the path of the template to render
+            template:  'static/privacy.html.twig'
 
-                # special options defined by Symfony to set the page cache
-                maxAge:    86400
-                sharedAge: 86400
+            # special options defined by Symfony to set the page cache
+            maxAge:    86400
+            sharedAge: 86400
 
-                # whether or not caching should apply for client caches only
-                private: true
+            # whether or not caching should apply for client caches only
+            private: true
 
-                # optionally you can define some arguments passed to the template
-                context:
-                    site_name: 'ACME'
-                    theme: 'dark'
+            # some variables passed to the template
+            context:
+                site_name: 'ACME'
+                theme: 'dark'
 
     .. code-block:: xml
 
@@ -491,58 +489,56 @@ provided by Symfony:
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
-            <route id="acme_privacy"
+            <template-route id="acme_privacy"
                 path="/privacy"
-                controller="Symfony\Bundle\FrameworkBundle\Controller\TemplateController">
                 <!-- the path of the template to render -->
-                <default key="template">static/privacy.html.twig</default>
+                template="static/privacy.html.twig"
 
                 <!-- special options defined by Symfony to set the page cache -->
-                <default key="maxAge">86400</default>
-                <default key="sharedAge">86400</default>
+                maxAge="86400"
+                sharedMaxAge="86400">
 
                 <!-- whether or not caching should apply for client caches only -->
                 <default key="private">true</default>
 
-                <!-- optionally you can define some arguments passed to the template -->
-                <default key="context">
-                    <default key="site_name">ACME</default>
-                    <default key="theme">dark</default>
-                </default>
-            </route>
+                <!-- some variables passed to the template -->
+                <context>
+                    <string key="site_name">ACME</string>
+                    <string key="theme">dark</string>
+                </context>
+            </template-route>
         </routes>
 
     .. code-block:: php
 
         // config/routes.php
-        use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('acme_privacy', '/privacy')
-                ->controller(TemplateController::class)
-                ->defaults([
-                    // the path of the template to render
-                    'template'  => 'static/privacy.html.twig',
-
-                    // special options defined by Symfony to set the page cache
-                    'maxAge'    => 86400,
-                    'sharedAge' => 86400,
-
-                    // whether or not caching should apply for client caches only
-                    'private' => true,
-
-                    // optionally you can define some arguments passed to the template
-                    'context' => [
-                        'site_name' => 'ACME',
-                        'theme' => 'dark',
-                    ]
+                // the path of the template to render and a context of variables passed to it
+                ->template('static/privacy.html.twig', [
+                    'site_name' => 'ACME',
+                    'theme' => 'dark',
                 ])
+
+                // special options defined by Symfony to set the page cache
+                ->maxAge(86400)
+                ->sharedMaxAge(86400)
+
+                // whether or not caching should apply for client caches only
+                ->private()
             ;
         };
 
+.. versionadded:: 5.1
+
+    This short syntax was introduced in Symfony 5.1. Before you had to
+    define the controller and specific route attributes using ``defaults``.
+
 .. versionadded:: 5.1
 
     The ``context`` option was introduced in Symfony 5.1.
diff --git a/translation/locale.rst b/translation/locale.rst
index 2dfd7c80b7c..b6bcfa26938 100644
--- a/translation/locale.rst
+++ b/translation/locale.rst
@@ -80,7 +80,7 @@ A better policy is to include the locale in the URL using the
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                https://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/framework-routing-1.0.xsd">
 
             <route id="contact" path="/{_locale}/contact">
                 controller="App\Controller\ContactController::index">
@@ -92,7 +92,7 @@ A better policy is to include the locale in the URL using the
 
         // config/routes.php
         use App\Controller\ContactController;
-        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+        use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
             $routes->add('contact', '/{_locale}/contact')