Merge branch '2.3' into 2.4

symfony · Dec 26, 2013 · 7c1b2c3 · 7c1b2c3
2 parents 3945d5f + 55dbd0b
commit 7c1b2c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
@@ -13,6 +13,8 @@ object and all sub-objects associated with it.
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Type`           |
 +----------------+---------------------------------------------------------------------+
 
+.. include:: /reference/forms/types/options/_error_bubbling_hint.rst.inc
+
 Basic Usage
 -----------
 

diff --git a/reference/forms/types/options/_error_bubbling_hint.rst b/reference/forms/types/options/_error_bubbling_hint.rst
@@ -0,0 +1,7 @@
+.. tip::
+
+    By default the ``error_bubbling`` option is enabled for the
+    :doc:`collection Field Type </reference/forms/types/collection>`,
+    which passes the errors to the parent form. If you want to attach
+    the errors to the locations where they actually occur you have to
+    set ``error_bubbling`` to ``false``.
diff --git a/reference/forms/types/options/cascade_validation.rst.inc b/reference/forms/types/options/cascade_validation.rst.inc
@@ -11,6 +11,5 @@ the data from ``CategoryType`` to also be validated.
 Instead of using this option, you can also use the ``Valid`` constraint in
 your model to force validation on a child object stored on a property.
 
-
-
+.. include:: /reference/forms/types/options/_error_bubbling_hint.rst.inc