Merge branch '2.5'

* 2.5:
  describe how to access form errors
  Fixed sentence

Author: weaverryan

components/console/changing_default_command.rst

@@ -8,9 +8,9 @@ Changing the Default Command
     The :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
     method was introduced in Symfony 2.5.
 
-will always run the ``ListCommand`` when no command name is passed. In order to change
-the default command you just need to pass the command name you want to run by
-default to the ``setDefaultCommand`` method::
+The Console component will always run the ``ListCommand`` when no command name is
+passed. In order to change the default command you just need to pass the command
+name to the ``setDefaultCommand`` method::
 
     namespace Acme\Console\Command;
 

components/form/introduction.rst

@@ -660,6 +660,33 @@ and the errors will display next to the fields on error.
     For a list of all of the built-in validation constraints, see
     :doc:`/reference/constraints`.
 
+Accessing Form Errors
+~~~~~~~~~~~~~~~~~~~~~
+
+You can use the :method:`Symfony\\Component\\Form\\FormInterface::getErrors`
+method to access the list of errors. Each element is a :class:`Symfony\\Component\\Form\\FormError`
+object::
+
+    $form = ...;
+
+    // ...
+
+    // an array of FormError objects, but only errors attached to this form level (e.g. "global errors)
+    $errors = $form->getErrors();
+
+    // an array of FormError objects, but only errors attached to the "firstName" field
+    $errors = $form['firstName']->getErrors();
+
+    // a string representation of all errors of the whole form tree
+    $errors = $form->getErrorsAsString();
+
+.. note::
+
+    If you enable the :ref:`error_bubbling <reference-form-option-error-bubbling>`
+    option on a field, calling ``getErrors()`` on the parent form will include
+    errors from that field. However, there is no way to determine which field
+    an error was originally attached to.
+
 .. _Packagist: https://packagist.org/packages/symfony/form
 .. _Twig:      http://twig.sensiolabs.org
 .. _`Twig Configuration`: http://twig.sensiolabs.org/doc/intro.html

reference/forms/types/form.rst

@@ -78,6 +78,8 @@ The actual default value of this option depends on other field options:
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :start-after: DEFAULT_PLACEHOLDER
 
+.. _reference-form-option-error-bubbling:
+
 .. include:: /reference/forms/types/options/error_bubbling.rst.inc
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc