From 6ba282e22b352ae44e02c829c9129b4a2c8b864b Mon Sep 17 00:00:00 2001 From: Bagus Erlang Date: Wed, 27 Nov 2019 13:21:13 +0800 Subject: [PATCH 1/3] uppercase --- setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.rst b/setup.rst index b6ccd34210b..f9585b1eb6a 100644 --- a/setup.rst +++ b/setup.rst @@ -237,7 +237,7 @@ stable version. If you want to use an LTS version, add the ``--version`` option: .. code-block:: terminal - # use the most recent 'lts' version + # use the most recent LTS version $ symfony new my_project_name --version=lts # use the 'next' Symfony version to be released (still in development) From f5f64e1b3ea06304a96639f9de74bb5ac9608b6c Mon Sep 17 00:00:00 2001 From: Jerzy Zawadzki Date: Wed, 27 Nov 2019 23:27:50 +0100 Subject: [PATCH 2/3] Changed names of Intl classes in form types docs --- reference/forms/types/country.rst | 2 +- reference/forms/types/currency.rst | 2 +- reference/forms/types/language.rst | 2 +- reference/forms/types/locale.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst index dbf2a87cc5b..da066decbb9 100644 --- a/reference/forms/types/country.rst +++ b/reference/forms/types/country.rst @@ -70,7 +70,7 @@ Overridden Options choices ~~~~~~~ -**default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()`` +**default**: ``Symfony\Component\Intl\Countries::getNames()`` The country type defaults the ``choices`` option to the whole list of countries. The locale is used to translate the countries names. diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst index 83fdafa4e17..9921baa75d9 100644 --- a/reference/forms/types/currency.rst +++ b/reference/forms/types/currency.rst @@ -62,7 +62,7 @@ Overridden Options choices ~~~~~~~ -**default**: ``Symfony\Component\Intl\Intl::getCurrencyBundle()->getCurrencyNames()`` +**default**: ``Symfony\Component\Intl\Currencies::getNames()`` The choices option defaults to all currencies. diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst index 7aee017fcce..9a751ecc4af 100644 --- a/reference/forms/types/language.rst +++ b/reference/forms/types/language.rst @@ -72,7 +72,7 @@ Overridden Options choices ~~~~~~~ -**default**: ``Symfony\Component\Intl\Intl::getLanguageBundle()->getLanguageNames()``. +**default**: ``Symfony\Component\Intl\Languages::getNames()``. The choices option defaults to all languages. The default locale is used to translate the languages names. diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst index 6afaddd6250..2ff8e24ce51 100644 --- a/reference/forms/types/locale.rst +++ b/reference/forms/types/locale.rst @@ -73,7 +73,7 @@ Overridden Options choices ~~~~~~~ -**default**: ``Symfony\Component\Intl\Intl::getLocaleBundle()->getLocaleNames()`` +**default**: ``Symfony\Component\Intl\Locales::getNames()`` The choices option defaults to all locales. It uses the default locale to specify the language. From 9da96e1c8f5977c22ad04b3e2ab76877a2a68375 Mon Sep 17 00:00:00 2001 From: Jerzy Zawadzki Date: Wed, 27 Nov 2019 23:18:45 +0100 Subject: [PATCH 3/3] [minor] remove usage of Kernel::$rootDir from docs --- reference/configuration/kernel.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/configuration/kernel.rst b/reference/configuration/kernel.rst index 4ef889f6fb5..5852927e7ad 100644 --- a/reference/configuration/kernel.rst +++ b/reference/configuration/kernel.rst @@ -105,7 +105,7 @@ method to return the right project directory:: Cache Directory ~~~~~~~~~~~~~~~ -**type**: ``string`` **default**: ``$this->rootDir/cache/$this->environment`` +**type**: ``string`` **default**: ``$this->getProjectDir()/var/cache/$this->environment`` This returns the absolute path of the cache directory of your Symfony project. It's calculated automatically based on the current @@ -119,7 +119,7 @@ cache directory. Log Directory ~~~~~~~~~~~~~ -**type**: ``string`` **default**: ``$this->rootDir/log`` +**type**: ``string`` **default**: ``$this->getProjectDir()/var/log`` .. deprecated:: 4.2