Merge branch '2.3'

Author: weaverryan

cookbook/form/inherit_data_option.rst

@@ -84,7 +84,7 @@ Let's build two forms for these entities, ``CompanyType`` and ``CustomerType``::
     }
 
 Instead of including the duplicated fields ``address``, ``zipcode``, ``city``
-and ``country``in both of these forms, we will create a third form for that.
+and ``country`` in both of these forms, we will create a third form for that.
 We will call this form simply ``LocationType``::
 
     // src/Acme/HelloBundle/Form/Type/LocationType.php

reference/forms/types/options/empty_value.rst.inc

@@ -3,9 +3,13 @@ empty_value
 
 **type**: ``string`` or ``Boolean``
 
+.. versionadded:: 2.3
+    Since Symfony 2.3, empty values are also supported if the ``expanded``
+    option is set to true.
+
 This option determines whether or not a special "empty" option (e.g. "Choose an option")
-will appear at the top of a select widget. This option only applies if both
-the ``expanded`` and ``multiple`` options are set to false.
+will appear at the top of a select widget. This option only applies if the
+``multiple`` option is set to false.
 
 * Add an empty value with "Choose an option" as the text::
 
@@ -26,4 +30,4 @@ is false::
     // a blank (with no text) option will be added
     $builder->add('states', 'choice', array(
         'required' => false,
-    ));
+    ));

reference/twig_reference.rst

@@ -134,6 +134,9 @@ Filters
 Tags
 ----
 
+.. versionadded:: 2.3
+    The stopwatch tag was added in Symfony 2.3
+
 +---------------------------------------------------+--------------------------------------------------------------------+
 | Tag Syntax                                        | Usage                                                              |
 +===================================================+====================================================================+
@@ -150,6 +153,9 @@ Tags
 | ``{% trans_default_domain language %}``           | This will set the default domain for message catalogues in the     |
 |                                                   | current template                                                   |
 +---------------------------------------------------+--------------------------------------------------------------------+
+| ``{% stopwatch name %}...{% endstopwatch %}``     | This will time the run time of the code inside it and put that on  |
+|                                                   | the timeline of the profiler.                                      |
++---------------------------------------------------+--------------------------------------------------------------------+
 
 Tests
 -----