From 75d70c47510f2c23d2d7a6246473429c45aaeb6b Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Sun, 2 Nov 2014 20:09:53 +0100
Subject: [PATCH 1/5] Documented the new label_format option

---
 reference/forms/types/checkbox.rst            |  2 ++
 reference/forms/types/choice.rst              |  2 ++
 reference/forms/types/collection.rst          |  2 ++
 reference/forms/types/country.rst             |  2 ++
 reference/forms/types/currency.rst            |  2 ++
 reference/forms/types/email.rst               |  2 ++
 reference/forms/types/entity.rst              |  2 ++
 reference/forms/types/file.rst                |  2 ++
 reference/forms/types/form.rst                |  2 ++
 reference/forms/types/integer.rst             |  2 ++
 reference/forms/types/language.rst            |  4 +++-
 reference/forms/types/locale.rst              |  2 ++
 reference/forms/types/money.rst               |  2 ++
 reference/forms/types/number.rst              |  4 +++-
 .../forms/types/options/label_format.rst      | 20 +++++++++++++++++++
 reference/forms/types/password.rst            |  2 ++
 reference/forms/types/percent.rst             |  2 ++
 reference/forms/types/radio.rst               |  2 ++
 reference/forms/types/reset.rst               |  2 ++
 reference/forms/types/search.rst              |  2 ++
 reference/forms/types/submit.rst              |  2 ++
 reference/forms/types/text.rst                |  2 ++
 reference/forms/types/textarea.rst            |  2 ++
 reference/forms/types/timezone.rst            |  2 ++
 reference/forms/types/url.rst                 |  2 ++
 25 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 reference/forms/types/options/label_format.rst

diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
index eeddb8031de..f688cc6a348 100644
--- a/reference/forms/types/checkbox.rst
+++ b/reference/forms/types/checkbox.rst
@@ -70,6 +70,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
index 95c91e8442b..fed65381453 100644
--- a/reference/forms/types/choice.rst
+++ b/reference/forms/types/choice.rst
@@ -180,6 +180,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index 78df3fdf7b9..57c9d2fc830 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -383,6 +383,8 @@ error_bubbling
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/required.rst.inc
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
index c50ac519a48..372ad490270 100644
--- a/reference/forms/types/country.rst
+++ b/reference/forms/types/country.rst
@@ -100,6 +100,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst
index f009d726993..06a5b51586f 100644
--- a/reference/forms/types/currency.rst
+++ b/reference/forms/types/currency.rst
@@ -90,6 +90,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst
index d6277f5bee9..28cd86365be 100644
--- a/reference/forms/types/email.rst
+++ b/reference/forms/types/email.rst
@@ -53,6 +53,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
index dcada6d96eb..92ff6a4f745 100644
--- a/reference/forms/types/entity.rst
+++ b/reference/forms/types/entity.rst
@@ -240,6 +240,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst
index 67e7d34c5b3..506a211def7 100644
--- a/reference/forms/types/file.rst
+++ b/reference/forms/types/file.rst
@@ -116,6 +116,8 @@ The default value is ``null``.
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
index ae0f66edcc0..45be80c30b5 100644
--- a/reference/forms/types/form.rst
+++ b/reference/forms/types/form.rst
@@ -94,6 +94,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. _reference-form-option-max_length:
diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst
index edf9e9c1b9b..74c40e93958 100644
--- a/reference/forms/types/integer.rst
+++ b/reference/forms/types/integer.rst
@@ -102,6 +102,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
index 120cb37b11c..798171c0a56 100644
--- a/reference/forms/types/language.rst
+++ b/reference/forms/types/language.rst
@@ -8,7 +8,7 @@ The ``language`` type is a subset of the ``ChoiceType`` that allows the user
 to select from a large list of languages. As an added bonus, the language names
 are displayed in the language of the user.
 
-The "value" for each language is the *Unicode language identifier* used in 
+The "value" for each language is the *Unicode language identifier* used in
 the `International Components for Unicode`_ (e.g. ``fr`` or ``zh_Hant``).
 
 .. note::
@@ -101,6 +101,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst
index e8610495901..07ad8d56b95 100644
--- a/reference/forms/types/locale.rst
+++ b/reference/forms/types/locale.rst
@@ -103,6 +103,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst
index dd466595c3b..5eae31cd7f8 100644
--- a/reference/forms/types/money.rst
+++ b/reference/forms/types/money.rst
@@ -112,6 +112,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst
index 29f4edfaf2e..453379b8da5 100644
--- a/reference/forms/types/number.rst
+++ b/reference/forms/types/number.rst
@@ -48,7 +48,7 @@ rounding_mode
 If a submitted number needs to be rounded (based on the ``precision``
 option), you have several configurable options for that rounding. Each
 option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\NumberToLocalizedStringTransformer`:
-    
+
 * ``NumberToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
 
 * ``NumberToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative
@@ -98,6 +98,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/options/label_format.rst b/reference/forms/types/options/label_format.rst
new file mode 100644
index 00000000000..c867ca90055
--- /dev/null
+++ b/reference/forms/types/options/label_format.rst
@@ -0,0 +1,20 @@
+label_format
+~~~~~~~~~~~~
+
+**type**: ``string`` **default**: The label is "humanized" version of the field name
+
+Sets the format applied to generate the ``<label>`` element, which will be used when
+rendering the label for the field. This option supports two placeholders called
+``%name%`` and ``%id%``::
+
+.. code-block:: php
+
+    // defining the label format for all the form fields
+    $form = $this->createForm('myform', $data, array('label_format' => 'form.label.%id%'));
+
+    // defining the label format for an individual form field (otherwise the label
+    // format is inherited from the parent form)
+    $builder->add('some_field', 'some_type', array(
+        // ...
+        'label_format' => '%name% (%id%)',
+    ));
diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst
index a7d605883ad..61bdd11a70a 100644
--- a/reference/forms/types/password.rst
+++ b/reference/forms/types/password.rst
@@ -68,6 +68,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst
index 253a43c69b5..9ffc72bba25 100644
--- a/reference/forms/types/percent.rst
+++ b/reference/forms/types/percent.rst
@@ -95,6 +95,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst
index 2bf650dc027..3af9867c9f7 100644
--- a/reference/forms/types/radio.rst
+++ b/reference/forms/types/radio.rst
@@ -61,6 +61,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/reset.rst b/reference/forms/types/reset.rst
index 20b2d9dad70..dd84f056793 100644
--- a/reference/forms/types/reset.rst
+++ b/reference/forms/types/reset.rst
@@ -34,4 +34,6 @@ Inherited Options
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/button_translation_domain.rst.inc
diff --git a/reference/forms/types/search.rst b/reference/forms/types/search.rst
index c9c9890d490..fee67a14ced 100644
--- a/reference/forms/types/search.rst
+++ b/reference/forms/types/search.rst
@@ -52,6 +52,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
index 01847034d84..9e0703c6556 100644
--- a/reference/forms/types/submit.rst
+++ b/reference/forms/types/submit.rst
@@ -44,6 +44,8 @@ Inherited Options
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/button_translation_domain.rst.inc
 
 validation_groups
diff --git a/reference/forms/types/text.rst b/reference/forms/types/text.rst
index 5fb4f07ae34..a9ab931110f 100644
--- a/reference/forms/types/text.rst
+++ b/reference/forms/types/text.rst
@@ -53,6 +53,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst
index a75ffbb0f27..813f4893b2b 100644
--- a/reference/forms/types/textarea.rst
+++ b/reference/forms/types/textarea.rst
@@ -55,6 +55,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc
diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst
index 175345b0330..fca0e12a5a1 100644
--- a/reference/forms/types/timezone.rst
+++ b/reference/forms/types/timezone.rst
@@ -96,6 +96,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst
index ace61dd0588..0a8b1947b1b 100644
--- a/reference/forms/types/url.rst
+++ b/reference/forms/types/url.rst
@@ -68,6 +68,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
+.. include:: /reference/forms/types/options/label_format.rst.inc
+
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
 .. include:: /reference/forms/types/options/max_length.rst.inc

From e4f8dbe79989b0ecd6c9303d375412577e76f93f Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Sun, 2 Nov 2014 20:12:07 +0100
Subject: [PATCH 2/5] Added the "new in Symfony 2.6" warning message

---
 reference/forms/types/options/label_format.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/reference/forms/types/options/label_format.rst b/reference/forms/types/options/label_format.rst
index c867ca90055..041eb1578c9 100644
--- a/reference/forms/types/options/label_format.rst
+++ b/reference/forms/types/options/label_format.rst
@@ -1,6 +1,9 @@
 label_format
 ~~~~~~~~~~~~
 
+.. versionadded:: 2.6
+    The ``label_format`` option was introduced in Symfony 2.6
+
 **type**: ``string`` **default**: The label is "humanized" version of the field name
 
 Sets the format applied to generate the ``<label>`` element, which will be used when

From db73c374e4e4159a98616dcbc5524d39a9503841 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 3 Nov 2014 10:17:22 +0100
Subject: [PATCH 3/5] Fixed the problems reported by @xabbuh

---
 .../types/options/{label_format.rst => label_format.rst.inc}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename reference/forms/types/options/{label_format.rst => label_format.rst.inc} (88%)

diff --git a/reference/forms/types/options/label_format.rst b/reference/forms/types/options/label_format.rst.inc
similarity index 88%
rename from reference/forms/types/options/label_format.rst
rename to reference/forms/types/options/label_format.rst.inc
index 041eb1578c9..114b369a299 100644
--- a/reference/forms/types/options/label_format.rst
+++ b/reference/forms/types/options/label_format.rst.inc
@@ -4,7 +4,7 @@ label_format
 .. versionadded:: 2.6
     The ``label_format`` option was introduced in Symfony 2.6
 
-**type**: ``string`` **default**: The label is "humanized" version of the field name
+**type**: ``string`` **default**: The label is the "humanized" version of the field name.
 
 Sets the format applied to generate the ``<label>`` element, which will be used when
 rendering the label for the field. This option supports two placeholders called

From be5ed52152efb2a44d79bb093d1ce6b11ac717aa Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 3 Nov 2014 10:27:20 +0100
Subject: [PATCH 4/5] Removed an unnecessary code-block directive

---
 _exts                                              | 2 +-
 reference/forms/types/options/label_format.rst.inc | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/_exts b/_exts
index 52f7bd2216c..e58edd22d16 160000
--- a/_exts
+++ b/_exts
@@ -1 +1 @@
-Subproject commit 52f7bd2216cc22ef52494f346c5643bb2a74513f
+Subproject commit e58edd22d16cb247267025d557410dcbfa5fa959
diff --git a/reference/forms/types/options/label_format.rst.inc b/reference/forms/types/options/label_format.rst.inc
index 114b369a299..d55a3ec5e93 100644
--- a/reference/forms/types/options/label_format.rst.inc
+++ b/reference/forms/types/options/label_format.rst.inc
@@ -10,8 +10,6 @@ Sets the format applied to generate the ``<label>`` element, which will be used
 rendering the label for the field. This option supports two placeholders called
 ``%name%`` and ``%id%``::
 
-.. code-block:: php
-
     // defining the label format for all the form fields
     $form = $this->createForm('myform', $data, array('label_format' => 'form.label.%id%'));
 

From 9721019520a85a452d273b83a3a7ba707955f7b4 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 11 Nov 2014 16:26:07 +0100
Subject: [PATCH 5/5] Reverted an accidental change in the subproject commit

---
 _exts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_exts b/_exts
index e58edd22d16..52f7bd2216c 160000
--- a/_exts
+++ b/_exts
@@ -1 +1 @@
-Subproject commit e58edd22d16cb247267025d557410dcbfa5fa959
+Subproject commit 52f7bd2216cc22ef52494f346c5643bb2a74513f