Skip to content

Commit

Permalink
Merge branch '4.3' into 4.4
Browse files Browse the repository at this point in the history
* 4.3:
  [minor] remove usage of Kernel::$rootDir from docs
  Changed names of Intl classes in form types docs
  uppercase
  • Loading branch information
javiereguiluz committed Nov 30, 2019
2 parents ab3a7eb + a9aa86a commit 81970b4
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions reference/configuration/kernel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -119,7 +119,7 @@ cache directory.
Log Directory
~~~~~~~~~~~~~

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

.. deprecated:: 4.2

Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/country.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,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.
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/currency.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/language.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,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.
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/locale.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 81970b4

Please sign in to comment.