Merge branch '2.3' into 2.4

symfony · Jan 1, 2014 · ddaf1a2 · ddaf1a2
2 parents 4f64a29 + 16fc80b
commit ddaf1a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/reference/forms/types/options/empty_data.rst.inc b/reference/forms/types/options/empty_data.rst.inc
@@ -8,8 +8,8 @@ choice is selected.
 
 The true default value of this option depends on the field options:
 
-* If ``data_class`` is set and  ``required`` is  ``true``, then ``null``;
-* If ``data_class`` is set and  ``required`` is  ``false``, then ``new $data_class()``;
+* If ``data_class`` is set and  ``required`` is  ``true``, then ``new $data_class()``;
+* If ``data_class`` is set and  ``required`` is  ``false``, then ``null``;
 * If ``data_class`` is not set and  ``compound`` is  ``true``, then ``array()``;
 * If ``data_class`` is not set and  ``compound`` is  ``false``, then ``null``.
 

diff --git a/reference/forms/types/options/required.rst.inc b/reference/forms/types/options/required.rst.inc
@@ -12,7 +12,7 @@ your validation information.
 
 .. note::
 
-    The required option does also affect the way how empty data of your form is
-    being handled. For further details check the `empty_data`_ option.
+    The required option also affects how empty data for each field is
+    handled. For more details, see the `empty_data`_ option.
 
 .. _`HTML5 required attribute`: http://diveintohtml5.info/forms.html