Skip to content

Commit d8ff742

Browse files
committed
Muerge branch '4.4' into 5.2
* 4.4: [Routing] Add small improvements
2 parents a325299 + d04a328 commit d8ff742

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

routing.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ and in route imports. Symfony defines some special attributes with the same name
12331233
format="html">
12341234
12351235
<requirement key="_locale">en|fr</requirement>
1236-
<requirement key="_format">html|rss</requirement>
1236+
<requirement key="_format">html|xml</requirement>
12371237
12381238
</route>
12391239
</routes>
@@ -1252,7 +1252,7 @@ and in route imports. Symfony defines some special attributes with the same name
12521252
->format('html')
12531253
->requirements([
12541254
'_locale' => 'en|fr',
1255-
'_format' => 'html|rss',
1255+
'_format' => 'html|xml',
12561256
])
12571257
;
12581258
};
@@ -2042,7 +2042,7 @@ multi-tenant applications) and these parameters can be validated too with
20422042
};
20432043
20442044
In the above example, the ``subdomain`` parameter defines a default value because
2045-
otherwise you need to include a domain value each time you generate a URL using
2045+
otherwise you need to include a subdomain value each time you generate a URL using
20462046
these routes.
20472047

20482048
.. tip::
@@ -2062,7 +2062,7 @@ these routes.
20622062
[],
20632063
['HTTP_HOST' => 'm.example.com']
20642064
// or get the value from some configuration parameter:
2065-
// ['HTTP_HOST' => 'm.' . $client->getContainer()->getParameter('domain')]
2065+
// ['HTTP_HOST' => 'm.'.$client->getContainer()->getParameter('domain')]
20662066
);
20672067

20682068
.. tip::
@@ -2225,7 +2225,7 @@ with a locale. This can be done by defining a different prefix for each locale
22252225
->prefix([
22262226
// don't prefix URLs for English, the default locale
22272227
'en' => '',
2228-
'nl' => '/nl'
2228+
'nl' => '/nl',
22292229
])
22302230
;
22312231
};

0 commit comments

Comments
 (0)