Merge branch '5.0'

* 5.0: A locale in this context is a comination of a language, a script and …

Author: javiereguiluz

components/intl.rst

@@ -210,10 +210,11 @@ You may convert codes between two-letter alpha2 and three-letter alpha3 codes::
 Locales
 ~~~~~~~
 
-A locale is the combination of a language and a region. For example, "Chinese"
-is the language and ``zh_Hans_MO`` is the locale for "Chinese" (language) +
-"Simplified" (script) + "Macau SAR China" (region). The ``Locales`` class
-provides access to the name of all locales::
+A locale is the combination of a language, a region and some parameters that
+define the interface preferences of the user. For example, "Chinese" is the 
+language and ``zh_Hans_MO`` is the locale for "Chinese" (language) + "Simplified" 
+(script) + "Macau SAR China" (region). The ``Locales`` class provides access to 
+the name of all locales::
 
  use Symfony\Component\Intl\Locales;