Skip to content

Commit 3b33532

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: use UTF-8 instead of utf-8
2 parents 98224e4 + 5be87ca commit 3b33532

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

components/translation/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ loaded/dumped when using this component inside a Symfony application:
431431

432432
.. code-block:: xml
433433
434-
<?xml version="1.0" encoding="utf-8"?>
434+
<?xml version="1.0" encoding="UTF-8"?>
435435
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0"
436436
srcLang="fr-FR" trgLang="en-US">
437437
<file id="messages.en_US">

security/remember_me.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
3333
.. code-block:: xml
3434
3535
<!-- config/packages/security.xml -->
36-
<?xml version="1.0" encoding="utf-8" ?>
36+
<?xml version="1.0" encoding="UTF-8" ?>
3737
<srv:container xmlns="http://symfony.com/schema/dic/security"
3838
xmlns:srv="http://symfony.com/schema/dic/services"
3939
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

service_container/tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ If you want to apply tags automatically for your own services, use the
8282
.. code-block:: xml
8383
8484
<!-- config/services.xml -->
85-
<?xml version="1.0" encoding="utf-8"?>
85+
<?xml version="1.0" encoding="UTF-8"?>
8686
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
8787
<services>
8888
<!-- this config only applies to the services created by this file -->

workflow/state-machines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Below is the configuration for the pull request state machine.
6969
.. code-block:: xml
7070
7171
<!-- config/packages/workflow.xml -->
72-
<?xml version="1.0" encoding="utf-8" ?>
72+
<?xml version="1.0" encoding="UTF-8" ?>
7373
<container xmlns="http://symfony.com/schema/dic/services"
7474
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7575
xmlns:framework="http://symfony.com/schema/dic/symfony"

workflow/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ like this:
6868
.. code-block:: xml
6969
7070
<!-- config/packages/workflow.xml -->
71-
<?xml version="1.0" encoding="utf-8" ?>
71+
<?xml version="1.0" encoding="UTF-8" ?>
7272
<container xmlns="http://symfony.com/schema/dic/services"
7373
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7474
xmlns:framework="http://symfony.com/schema/dic/symfony"

0 commit comments

Comments
 (0)