8000 Merge branch '5.1' into master · symfony/symfony-docs@f9c2a32 · GitHub
[go: up one dir, main page]

Skip to content

Commit f9c2a32

Browse files
committed
Merge branch '5.1' into master
* 5.1: Removed versionadded 4.4 directives Fixed DOCtor errors
2 parents 2d7fde7 + ce94f89 commit f9c2a32

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

configuration.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ configuration files, even if they use a different format:
144144
145145
// ...
146146
147-
.. versionadded:: 4.4
148-
149-
The ``not_found`` option value for ``ignore_errors`` was introduced in Symfony 4.4.
150-
151147
.. _config-parameter-intro:
152148
.. _config-parameters-yml:
153149
.. _configuration-parameters:

service_container/tags.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -735,19 +735,19 @@ indexed by the ``key`` attribute:
735735
<container xmlns="http://symfony.com/schema/dic/services"
736736
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
737737
xsi:schemaLocation="http://symfony.com/schema/dic/services
738-
http://symfony.com/schema/dic/services/services-1.0.xsd">
738+
https://symfony.com/schema/dic/services/services-1.0.xsd">
739739
740740
<services>
741741
<service id="App\Handler\One">
742-
<tag name="app.handler" key="handler_one" />
742+
<tag name="app.handler" key="handler_one"/>
743743
</service>
744744
745745
<service id="App\Handler\Two">
746-
<tag name="app.handler" key="handler_two" />
746+
<tag name="app.handler" key="handler_two"/>
747747
</service>
748748
749749
<service id="App\HandlerCollection">
750-
<argument type="tagged_iterator" tag="app.handler" index-by="key" />
750+
<argument type="tagged_iterator" tag="app.handler" index-by="key"/>
751751
</service>
752752
</services>
753753
</container>
@@ -836,7 +836,7 @@ to get an array and then retrieve the ``handler_two`` handler::
836836
<container xmlns="http://symfony.com/schema/dic/services"
837837
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
838838
xsi:schemaLocation="http://symfony.com/schema/dic/services
839-
http://symfony.com/schema/dic/services/services-1.0.xsd">
839+
https://symfony.com/schema/dic/services/services-1.0.xsd">
840840
841841
<services>
842842
<!-- ... --!>

0 commit comments

Comments
 (0)
0