From 07a168a8f6c0fb4d67574df90737f332bd246ff3 Mon Sep 17 00:00:00 2001
From: Johan Desmyter <johan@etic.yt>
Date: Fri, 3 Jan 2014 08:48:01 +0300
Subject: [PATCH 1/2] add default value to mapped option of entity

---
 reference/forms/types/options/mapped.rst.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/forms/types/options/mapped.rst.inc b/reference/forms/types/options/mapped.rst.inc
index 434f97ebd89..044eedc815e 100644
--- a/reference/forms/types/options/mapped.rst.inc
+++ b/reference/forms/types/options/mapped.rst.inc
@@ -1,7 +1,7 @@
 mapped
 ~~~~~~
 
-**type**: ``boolean``
+**type**: ``boolean``  **default**: ``true``
 
 If you wish the field to be ignored when reading or writing to the object, you
 can set the ``mapped`` option to ``false``.

From 39f92e9d1bf9a06091bb3940ea840743077cee63 Mon Sep 17 00:00:00 2001
From: Johan Desmyter <johan@etic.yt>
Date: Fri, 3 Jan 2014 22:39:13 +0300
Subject: [PATCH 2/2] document auto_initialize overriden option

---
 reference/forms/types/button.rst                           | 4 ++++
 .../forms/types/options/button_auto_initialize.rst.inc     | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 reference/forms/types/options/button_auto_initialize.rst.inc

diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
index 5c73b5f34e1..44bf65a90b7 100644
--- a/reference/forms/types/button.rst
+++ b/reference/forms/types/button.rst
@@ -18,6 +18,8 @@ A simple, non-responsive button.
 |                      | - `label_attr`_                                                      |
 |                      | - `translation_domain`_                                              |
 +----------------------+----------------------------------------------------------------------+
+| Overridden Options   | - `auto_initialize`                                                  |
++----------------------+----------------------------------------------------------------------+
 | Parent type          | none                                                                 |
 +----------------------+----------------------------------------------------------------------+
 | Class                | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType` |
@@ -35,3 +37,5 @@ Options
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
 .. include:: /reference/forms/types/options/button_translation_domain.rst.inc
+
+.. include:: /reference/forms/types/options/button_auto_initialize.rst.inc
diff --git a/reference/forms/types/options/button_auto_initialize.rst.inc b/reference/forms/types/options/button_auto_initialize.rst.inc
new file mode 100644
index 00000000000..c16ffd843ce
--- /dev/null
+++ b/reference/forms/types/options/button_auto_initialize.rst.inc
@@ -0,0 +1,7 @@
+auto_initialize
+~~~~~~~~~~~~~~~
+
+**type**: ``boolean``  **default**: ``false``
+
+Sets whether the form should be initialized automatically. This option is
+not modifiable as buttons do not support automatic initialization.