symfony
diff --git a/‎reference/forms/types/options/data.rst.inc
Copy file name to clipboardExpand all lines: reference/forms/types/options/data.rst.inc
+5-2Lines changed: 5 additions & 2 deletions b/‎reference/forms/types/options/data.rst.inc
Copy file name to clipboardExpand all lines: reference/forms/types/options/data.rst.inc
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎reference/forms/types/options/empty_data.rst.inc
Copy file name to clipboardExpand all lines: reference/forms/types/options/empty_data.rst.inc
+15-4Lines changed: 15 additions & 4 deletions b/‎reference/forms/types/options/empty_data.rst.inc
Copy file name to clipboardExpand all lines: reference/forms/types/options/empty_data.rst.inc
+15-4Lines changed: 15 additions & 4 deletions
@@ -6,14 +6,17 @@ data
 When you attach a form type to a form, it becomes a field that initially maps
 the value of the corresponding property or key of the form's domain data. If
 you want to override the initial value which will be rendered in the view for
-the form or any field, you can set it in the data option::
+the form or any nested field, you can set it in the data option::
 
     $builder->add('token', 'hidden', array(
         'data' => 'abcdef',
     ));
 
+    // Is the same as
+    $resolver->setDefault('data' => array('token' => 'abcdef'));
+
 .. note::
 
     The default values for form fields are taken directly from the underlying
-    data structure matching the field name with a property of an object or a
+    data structure matching the field's name with a property of an object or a
     key of an array. The ``data`` option overrides this default value.
@@ -1,7 +1,7 @@
 empty_data
 ~~~~~~~~~~
 
-**type**: ``mixed``
+**type**: ``string`` or ``array`` when the form is compound
 
 .. This file should only be included with start-after or end-before that's
    set to this placeholder value. Its purpose is to let us include only
@@ -14,19 +14,30 @@ value is empty. It does not set an initial value if none is provided when
 the form is rendered in a view (see ``data`` or ``placeholder`` options).
 
 It helps you handling form submission and you can customize this to your needs.
-For example, if you want the ``gender`` choice field to be explicitly set to ``null``
+For example, if you want the ``gender`` choice field to be explicitly set to ``Male``
 when no value is selected, you can do it like this::
 
     $builder->add('gender', 'choice', array(
         'choices' => array(
             'm' => 'Male',
-            'f' => 'Female'
+            'f' => 'Female',
         ),
         'required'    => false,
         'placeholder' => 'Choose your gender',
-        'empty_data'  => null
+        'empty_data'  => 'm',
     ));
 
+If a form is compound, you can set ``empty_data`` as an array with fields names
+as keys and submitted values as string values (or arrays if nested fields are
+also compound).
+
+.. caution::
+
+    In this example, the choice field is not set as ``multiple``. If it was
+    ``empty_data`` option should be an array of submitted string values::
+
+        'empty_data' => array('m'),
+
 .. note::
 
     If you want to set the ``empty_data`` option for your entire form class,