minor symfony#3538 Rebasing symfony#3518 (weaverryan)

weaverryan · weaverryan · commit 6848bed18852 · 2014-02-03T21:12:06.000-06:00
This PR was merged into the 2.3 branch. Discussion ---------- Rebasing symfony#3518 This is just a rebase of symfony#3518 against the 2.3 branch so that it can be merged cleanly. Commits ------- 561d201 update collection.rst - add cascade_validation opt
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -28,6 +28,7 @@ forms, which is useful when creating forms that expose one-to-many relationships
 |             | - `empty_data`_                                                             |
 |             | - `required`_                                                               |
 |             | - `mapped`_                                                                 |
+|             | - `cascade_validation`_                                                     |
 +-------------+-----------------------------------------------------------------------------+
 | Parent type | :doc:`form </reference/forms/types/form>`                                   |
 +-------------+-----------------------------------------------------------------------------+
@@ -363,3 +364,5 @@ error_bubbling
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
+
+.. include:: /reference/forms/type/options/cascade_validation.rst.inc
