Merge branch '4.4'

* 4.4:
  [Form] Documented the intl option in TimezoneType
  Removed a broken link

Author: javiereguiluz

controller.rst

@@ -93,7 +93,7 @@ The Base Controller Class & Services
 
 To aid development, Symfony comes with an optional base controller class called
 :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController`.
-It can be extended to gain access to `helper methods`_.
+It can be extended to gain access to helper methods.
 
 Add the ``use`` statement atop your controller class and then modify
 ``LuckyController`` to extend it:
@@ -641,6 +641,5 @@ Learn more about Controllers
 
     controller/*
 
-.. _`helper methods`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
 .. _`Symfony Maker`: https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html
 .. _`unvalidated redirects security vulnerability`: https://www.owasp.org/index.php/Open_redirect

reference/forms/types/timezone.rst

@@ -18,13 +18,14 @@ manually, but then you should just use the ``ChoiceType`` directly.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
 +-------------+------------------------------------------------------------------------+
 | Options     | - `input`_                                                             |
-|             |                                                                        |
+|             | - `intl`_                                                              |
 +-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
 | options     |                                                                        |
 +-------------+------------------------------------------------------------------------+
 | Inherited   | from the :doc:`ChoiceType </reference/forms/types/choice>`             |
 | options     |                                                                        |
+|             | - `choice_translation_domain`_                                         |
 |             | - `expanded`_                                                          |
 |             | - `multiple`_                                                          |
 |             | - `placeholder`_                                                       |
@@ -69,6 +70,24 @@ on your underlying object. Valid values are:
 * ``intltimezone`` (an ``\IntlTimeZone`` object)
 * ``string`` (e.g. ``America/New_York``)
 
+intl
+~~~~
+
+*type**: ``boolean`` **default**: ``false``
+
+If this option is set to ``true``, the timezone selector will display the
+timezones from the `ICU Project`_ via the :doc:`Intl component </components/intl>`
+instead of the regular PHP timezones.
+
+Although both sets of timezones are pretty similar, only the ones from the Intl
+component can be translated to any language. To do so, set the desired locale
+with the ``choice_translation_locale`` option.
+
+.. note::
+
+    The :doc:`Timezone constraint </reference/constraints/Timezone>` can validate
+    both timezone sets and adapts to the selected set automatically.
+
 Overridden Options
 ------------------
 
@@ -90,6 +109,8 @@ Inherited Options
 
 These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`:
 
+.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
+
 .. include:: /reference/forms/types/options/expanded.rst.inc
 
 .. include:: /reference/forms/types/options/multiple.rst.inc
@@ -137,3 +158,5 @@ The actual default value of this option depends on other field options:
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/required.rst.inc
+
+.. _`ICU Project`: http://site.icu-project.org/