Merge branch '5.4' into 6.0

* 5.4:
  [Routing] Add small improvements

Author: OskarStark

routing.rst

@@ -1233,7 +1233,7 @@ and in route imports. Symfony defines some special attributes with the same name
                 format="html">
 
                 <requirement key="_locale">en|fr</requirement>
-                <requirement key="_format">html|rss</requirement>
+                <requirement key="_format">html|xml</requirement>
 
             </route>
         </routes>
@@ -1252,7 +1252,7 @@ and in route imports. Symfony defines some special attributes with the same name
                 ->format('html')
                 ->requirements([
                     '_locale' => 'en|fr',
-                    '_format' => 'html|rss',
+                    '_format' => 'html|xml',
                 ])
             ;
         };
@@ -2042,7 +2042,7 @@ multi-tenant applications) and these parameters can be validated too with
         };
 
 In the above example, the ``subdomain`` parameter defines a default value because
-otherwise you need to include a domain value each time you generate a URL using
+otherwise you need to include a subdomain value each time you generate a URL using
 these routes.
 
 .. tip::
@@ -2062,7 +2062,7 @@ these routes.
             [],
             ['HTTP_HOST' => 'm.example.com']
             // or get the value from some configuration parameter:
-            // ['HTTP_HOST' => 'm.' . $client->getContainer()->getParameter('domain')]
+            // ['HTTP_HOST' => 'm.'.$client->getContainer()->getParameter('domain')]
         );
 
 .. tip::
@@ -2225,7 +2225,7 @@ with a locale. This can be done by defining a different prefix for each locale
                 ->prefix([
                     // don't prefix URLs for English, the default locale
                     'en' => '',
-                    'nl' => '/nl'
+                    'nl' => '/nl',
                 ])
             ;
         };