From b1925f59528d91fa62fb1eceeb41c38a2fc7e3ad Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Fri, 22 Feb 2019 10:43:21 +0100 Subject: [PATCH 1/2] remove the mention of .yml we should not promote the usage of .yml anymore --- configuration/configuration_organization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/configuration_organization.rst b/configuration/configuration_organization.rst index b3a06a89aae..a5eacf045db 100644 --- a/configuration/configuration_organization.rst +++ b/configuration/configuration_organization.rst @@ -78,7 +78,7 @@ Mix and Match Configuration Formats ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Configuration files can import files defined with any other built-in configuration -format (``.yaml`` or ``.yml``, ``.xml``, ``.php``, ``.ini``): +format (``.yaml``, ``.xml``, ``.php``, ``.ini``): .. configuration-block:: From 54b92152ec2df2b15d48d1bc5311413d9cfd7596 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Fri, 22 Feb 2019 10:49:30 +0100 Subject: [PATCH 2/2] remove mention of .yml --- reference/configuration/framework.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 7e1f0a8a589..b36cc3106bc 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -705,7 +705,7 @@ type The type of the resource to hint the loaders about the format. This isn't needed when you use the default routers with the expected file extensions -(``.xml``, ``.yml`` or ``.yaml``, ``.php``). +(``.xml``, ``.yaml``, ``.php``). http_port .........