Merge branch '4.2'

* 4.2:
  add form name caution to choice_name option
  Re-added a note about configuration imports
  Update create_custom_field_type.rst

Author: javiereguiluz

configuration/configuration_organization.rst

@@ -124,6 +124,8 @@ When the configuration values are dynamic, you can use the PHP configuration
 file to execute your own logic. In addition, you can define your own services
 to load configurations from databases or web services.
 
+.. include:: /components/dependency_injection/_imports-parameters-note.rst.inc
+
 Global Configuration Files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

form/create_custom_field_type.rst

@@ -150,12 +150,12 @@ link for details), create a ``shipping_widget`` block to handle this:
         {% spaceless %}
             {% if expanded %}
                 <ul {{ block('widget_container_attributes') }}>
-                {% for child in form if not child.rendered %}
-                    <li>
-                        {{ form_widget(child) }}
-                        {{ form_label(child) }}
-                    </li>
-                {% endfor %}
+                    {% for child in form if not child.rendered %}
+                        <li>
+                            {{ form_widget(child) }}
+                            {{ form_label(child) }}
+                        </li>
+                    {% endfor %}
                 </ul>
             {% else %}
                 {# let the choice widget render the select tag #}

reference/forms/types/options/choice_name.rst.inc

@@ -9,3 +9,10 @@ of the choice views in the template.
 
 This can be a callable or a property path. See `choice_label`_ for similar usage.
 If ``null`` is used, an incrementing integer is used as the name.
+
+.. caution::
+
+    The configured value must be a valid form name. Make sure to only return
+    valid names when using a callable. Valid form names must be composed of
+    letters, digits, underscores, dashes and colons and must not start with
+    a dash or a colon.