From f6a65660b5c329c99979efa26011324f02b98628 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 12 Apr 2014 11:56:31 +0200 Subject: [PATCH 1/3] document the default value of the form's compound option --- reference/forms/types/options/compound.rst.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/forms/types/options/compound.rst.inc b/reference/forms/types/options/compound.rst.inc index d8b07f65315..009a2c9725a 100644 --- a/reference/forms/types/options/compound.rst.inc +++ b/reference/forms/types/options/compound.rst.inc @@ -1,7 +1,7 @@ compound ~~~~~~~~ -**type**: ``boolean`` +**type**: ``boolean`` **default**: ``true`` This option specifies if a form is compound. This is independent of whether the form actually has children. A form can be compound but not have any children From 8e7ebf558f3b6ded2857e1cb0ce0c0f3d09fcf22 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 12 Apr 2014 12:08:19 +0200 Subject: [PATCH 2/3] add the action option and the method option to the introductionary table, remove doubled include of them --- reference/forms/types/form.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index 38416d12aa9..b5f0d50bbd8 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -30,6 +30,8 @@ on all types for which ``form`` is the parent type. | | - `extra_fields_message`_ | | | - `post_max_size_message`_ | | | - `pattern`_ | +| | - `action`_ | +| | - `method`_ | +-----------+--------------------------------------------------------------------+ | Inherited | - `block_name`_ | | options | - `disabled`_ | @@ -50,10 +52,6 @@ Options .. include:: /reference/forms/types/options/data_class.rst.inc -.. include:: /reference/forms/types/options/action.rst.inc - -.. include:: /reference/forms/types/options/method.rst.inc - .. include:: /reference/forms/types/options/empty_data.rst.inc .. include:: /reference/forms/types/options/compound.rst.inc From 8a6feb891d403000f66cbeb3b56e53ba30f93dd5 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 12 Apr 2014 12:10:46 +0200 Subject: [PATCH 3/3] fix the order of the options in the table to match their order below --- reference/forms/types/form.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index b5f0d50bbd8..e42c974c158 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -8,10 +8,10 @@ The ``form`` type predefines a couple of options that are then available on all types for which ``form`` is the parent type. +-----------+--------------------------------------------------------------------+ -| Options | - `compound`_ | -| | - `data`_ | +| Options | - `data`_ | | | - `data_class`_ | | | - `empty_data`_ | +| | - `compound`_ | | | - `required`_ | | | - `label_attr`_ | | | - `constraints`_ |