diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
index 18cbbd3103f..d688598008a 100644
--- a/reference/forms/types/button.rst
+++ b/reference/forms/types/button.rst
@@ -18,7 +18,7 @@ A simple, non-responsive button.
 |                      | - `label_attr`_                                                      |
 |                      | - `translation_domain`_                                              |
 +----------------------+----------------------------------------------------------------------+
-| Overridden Options   | - `auto_initialize`                                                  |
+| Overridden options   | - `auto_initialize`_                                                 |
 +----------------------+----------------------------------------------------------------------+
 | Parent type          | none                                                                 |
 +----------------------+----------------------------------------------------------------------+
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
index 159ef755c30..aeefb915ccf 100644
--- a/reference/forms/types/checkbox.rst
+++ b/reference/forms/types/checkbox.rst
@@ -13,9 +13,11 @@ if the box is unchecked, the value will be set to false.
 +-------------+------------------------------------------------------------------------+
 | Options     | - `value`_                                                             |
 +-------------+------------------------------------------------------------------------+
+| Overridden  | - `empty_data`_                                                        |
+| options     | - `compound`_                                                          |
++-------------+------------------------------------------------------------------------+
 | Inherited   | - `data`_                                                              |
-| options     | - `empty_data`_                                                        |
-|             | - `required`_                                                          |
+| options     | - `required`_                                                          |
 |             | - `label`_                                                             |
 |             | - `label_attr`_                                                        |
 |             | - `read_only`_                                                         |
@@ -44,6 +46,13 @@ Field Options
 
 .. include:: /reference/forms/types/options/value.rst.inc
 
+Overridden options
+------------------
+
+.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
+
+.. include:: /reference/forms/types/options/checkbox_compound.rst.inc
+
 Inherited options
 -----------------
 
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
index b69e48c32ed..c60b2f29f55 100644
--- a/reference/forms/types/choice.rst
+++ b/reference/forms/types/choice.rst
@@ -20,18 +20,20 @@ option.
 |             | - `preferred_choices`_                                                       |
 |             | - `empty_value`_                                                             |
 +-------------+------------------------------------------------------------------------------+
+| Overridden  | - `empty_data`_                                                              |
+| options     | - `compound`_                                                                |
+|             | - `error_bubbling`_                                                          |
++-------------+------------------------------------------------------------------------------+
 | Inherited   | - `required`_                                                                |
 | options     | - `label`_                                                                   |
 |             | - `label_attr`_                                                              |
 |             | - `data`_                                                                    |
 |             | - `read_only`_                                                               |
 |             | - `disabled`_                                                                |
-|             | - `error_bubbling`_                                                          |
 |             | - `error_mapping`_                                                           |
 |             | - `mapped`_                                                                  |
 |             | - `inherit_data`_                                                            |
 |             | - `by_reference`_                                                            |
-|             | - `empty_data`_                                                              |
 +-------------+------------------------------------------------------------------------------+
 | Parent type | :doc:`form </reference/forms/types/form>`                                    |
 +-------------+------------------------------------------------------------------------------+
@@ -109,6 +111,27 @@ can be created to supply the choices.
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
+Overridden options
+------------------
+
+.. include:: /reference/forms/types/options/empty_data.rst.inc
+
+compound
+~~~~~~~~
+
+**type**: ``boolean`` **default**: same value as ``expanded`` option
+
+This option specifies if a form is compound. The value is by default 
+overriden by the value of the ``expanded`` option.
+
+error_bubbling
+~~~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+Set that error on this field must be attached to the field instead of 
+the parent field (the form in most cases).
+
 Inherited options
 -----------------
 
@@ -126,8 +149,6 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc
-
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
@@ -135,5 +156,3 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/by_reference.rst.inc
-
-.. include:: /reference/forms/types/options/empty_data.rst.inc
diff --git a/reference/forms/types/options/checkbox_compound.rst.inc b/reference/forms/types/options/checkbox_compound.rst.inc
new file mode 100644
index 00000000000..855969d870c
--- /dev/null
+++ b/reference/forms/types/options/checkbox_compound.rst.inc
@@ -0,0 +1,8 @@
+compound
+~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+This option specifies if a form is compound. As it's not the
+case for checkbox, by fefault the value is overriden with
+``false`` value.
diff --git a/reference/forms/types/options/checkbox_empty_data.rst.inc b/reference/forms/types/options/checkbox_empty_data.rst.inc
new file mode 100644
index 00000000000..8143ad364ce
--- /dev/null
+++ b/reference/forms/types/options/checkbox_empty_data.rst.inc
@@ -0,0 +1,9 @@
+empty_data
+~~~~~~~~~~
+
+**type**: ``string`` **default**: ``mixed``
+
+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`).