minor #3579 Fix build errors (xabbuh)

This PR was merged into the 2.3 branch. Discussion ---------- Fix build errors | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3/2.4 | Fixed tickets | This is a backport of #3544. Commits ------- 3e0d1f4 remove empty_data from the list of inherited options, it's documented in the overriden options section e702b34 fix referenced documents names
symfony · Feb 16, 2014 · 6a2a55b · 6a2a55b
2 parents d275302 + 3e0d1f4
commit 6a2a55b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
@@ -60,8 +60,6 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
-.. include:: /reference/forms/types/options/empty_data.rst.inc
-
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc

diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -365,4 +365,4 @@ error_bubbling
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
-.. include:: /reference/forms/type/options/cascade_validation.rst.inc
+.. include:: /reference/forms/types/options/cascade_validation.rst.inc
diff --git a/reference/forms/types/options/checkbox_empty_data.rst.inc b/reference/forms/types/options/checkbox_empty_data.rst.inc
@@ -6,4 +6,4 @@ empty_data
 This option determines what value the field will return when the ``empty_value``
 choice is selected.
 In checkbox, the value of ``empty_data`` is overriden by the value returned by
-the data transformer (see :doc:`/cookbook/form/data_transformers.rst`).
+the data transformer (see :doc:`/cookbook/form/data_transformers`).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -365,4 +365,4 @@ error_bubbling

		.. include:: /reference/forms/types/options/mapped.rst.inc

		.. include:: /reference/forms/type/options/cascade_validation.rst.inc
		.. include:: /reference/forms/types/options/cascade_validation.rst.inc