Skip to content

Commit c850e8c

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: [minor] remove usage of Kernel::$rootDir from docs Changed names of Intl classes in form types docs uppercase
2 parents c5d0e22 + 81970b4 commit c850e8c

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

reference/configuration/kernel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ method to return the right project directory::
8787
Cache Directory
8888
~~~~~~~~~~~~~~~
8989

90-
**type**: ``string`` **default**: ``$this->rootDir/cache/$this->environment``
90+
**type**: ``string`` **default**: ``$this->getProjectDir()/var/cache/$this->environment``
9191

9292
This returns the absolute path of the cache directory of your Symfony project.
9393
It's calculated automatically based on the current
@@ -101,7 +101,7 @@ cache directory.
101101
Log Directory
102102
~~~~~~~~~~~~~
103103

104-
**type**: ``string`` **default**: ``$this->rootDir/log``
104+
**type**: ``string`` **default**: ``$this->getProjectDir()/var/log``
105105

106106
This returns the absolute path of the log directory of your Symfony project.
107107
It's calculated automatically based on the current

reference/forms/types/country.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Overridden Options
8080
choices
8181
~~~~~~~
8282

83-
**default**: ``Symfony\Component\Intl\Intl::getRegionBundle()->getCountryNames()``
83+
**default**: ``Symfony\Component\Intl\Countries::getNames()``
8484

8585
The country type defaults the ``choices`` option to the whole list of countries.
8686
The locale is used to translate the countries names.

reference/forms/types/currency.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Overridden Options
6262
choices
6363
~~~~~~~
6464

65-
**default**: ``Symfony\Component\Intl\Intl::getCurrencyBundle()->getCurrencyNames()``
65+
**default**: ``Symfony\Component\Intl\Currencies::getNames()``
6666

6767
The choices option defaults to all currencies.
6868

reference/forms/types/language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Overridden Options
8282
choices
8383
~~~~~~~
8484

85-
**default**: ``Symfony\Component\Intl\Intl::getLanguageBundle()->getLanguageNames()``.
85+
**default**: ``Symfony\Component\Intl\Languages::getNames()``.
8686

8787
The choices option defaults to all languages.
8888
The default locale is used to translate the languages names.

reference/forms/types/locale.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Overridden Options
7373
choices
7474
~~~~~~~
7575

76-
**default**: ``Symfony\Component\Intl\Intl::getLocaleBundle()->getLocaleNames()``
76+
**default**: ``Symfony\Component\Intl\Locales::getNames()``
7777

7878
The choices option defaults to all locales. It uses the default locale to
7979
specify the language.

setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ stable version. If you want to use an LTS version, add the ``--version`` option:
237237

238238
.. code-block:: terminal
239239
240-
# use the most recent 'lts' version
240+
# use the most recent LTS version
241241
$ symfony new my_project_name --version=lts
242242
243243
# use the 'next' Symfony version to be released (still in development)

0 commit comments

Comments
 (0)