Fixed spelling and grammar errors

book/forms.rst

@@ -291,11 +291,11 @@ Let's add a second button with the caption "Save and add" to our form::
  ->getForm();
 
 In your controller, use the button's
-:method:`Symfony\\Component\\Form\\ClickableInterface\\isClicked` method for
+:method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` method for
 querying if the "Save and add" button was clicked::
 
  if ($form->isValid()) {
- // perform some action, such as saving the task to the database
+ // ... perform some action, such as saving the task to the database
 
  $nextAction = $form->get('saveAndAdd')->isClicked()
  ? 'task_new'
@@ -454,8 +454,9 @@ Disabling Validation
 ~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
- The ability to set ``validation_groups`` to false is new to version 2.3.
- Setting it to an empty array was already supported before.
+ The ability to set ``validation_groups`` to false was added in Symfony 2.3,
+ although setting it to an empty array achieved the same result in previous
+ versions.
 
 Sometimes it is useful to suppress the validation of a form altogether. For
 these cases, you can skip the call to :method:`Symfony\\Component\\Form\\FormInterface::isValid`

reference/forms/types/button.rst

@@ -5,22 +5,22 @@ button Field Type
 =================
 
 .. versionadded:: 2.3
- The ``button`` type is new in version 2.3
+ The ``button`` type was added in Symfony 2.3
 
 A simple, non-responsive button.
 
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Rendered as | ``button`` tag  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Options | - `attr`_  |
-| | - `disabled`_  |
-| | - `label`_  |
-| | - `translation_domain`_  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Parent type | none  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType`  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
++----------------------+----------------------------------------------------------------------+
+| Rendered as | ``button`` tag |
++----------------------+----------------------------------------------------------------------+
+| Options | - `attr`_ |
+| | - `disabled`_ |
+| | - `label`_ |
+| | - `translation_domain`_ |
++----------------------+----------------------------------------------------------------------+
+| Parent type | none |
++----------------------+----------------------------------------------------------------------+
+| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType` |
++----------------------+----------------------------------------------------------------------+
 
 Options
 -------

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

@@ -5,5 +5,5 @@ disabled
 
 If you don't want a user to be able to click a button, you can set the disabled
 option to true. It will not be possible to submit the form with this button,
-not even when bypassing the browser and sending an request manually, for
+not even when bypassing the browser and sending a request manually, for
 example with cURL.

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

@@ -5,7 +5,13 @@ label
 
 Sets the label that will be displayed on the button. The label can also be
 directly set inside the template:
-
-.. code-block:: jinja
 
- {{ form_widget(form.save, { 'label': 'Click me' }) }}
+.. configuration-block::
+
+ .. code-block:: html+jinja
+
+ {{ form_widget(form.save, { 'label': 'Click me' }) }}
+
+ .. code-block:: html+php
+
+ <?php echo $view['form']->widget($form['save'], array('label' => 'Click me')) ?>

reference/forms/types/reset.rst

@@ -5,22 +5,22 @@ reset Field Type
 ================
 
 .. versionadded:: 2.3
- The ``submit`` type is new in version 2.3
+ The ``reset`` type was added in Symfony 2.3
 
 A button that resets all fields to their original values.
 
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Rendered as | ``input`` ``reset`` tag  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Inherited | - `attr`_  |
-| options | - `disabled`_  |
-| | - `label`_  |
-| | - `translation_domain`_  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Parent type | :doc:`button</reference/forms/types/button>`  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType`  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
++----------------------+---------------------------------------------------------------------+
+| Rendered as | ``input`` ``reset`` tag |
++----------------------+---------------------------------------------------------------------+
+| Inherited | - `attr`_ |
+| options | - `disabled`_ |
+| | - `label`_ |
+| | - `translation_domain`_ |
++----------------------+---------------------------------------------------------------------+
+| Parent type | :doc:`button</reference/forms/types/button>` |
++----------------------+---------------------------------------------------------------------+
+| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ResetType` |
++----------------------+---------------------------------------------------------------------+
 
 Inherited options
 -----------------

reference/forms/types/submit.rst

@@ -5,25 +5,25 @@ submit Field Type
 =================
 
 .. versionadded:: 2.3
- The ``submit`` type is new in version 2.3
+ The ``submit`` type was added in Symfony 2.3
 
 A submit button.
 
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Rendered as | ``input`` ``submit`` tag  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Inherited | - `attr`_  |
-| options | - `disabled`_  |
-| | - `label`_  |
-| | - `translation_domain`_  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Parent type | :doc:`button</reference/forms/types/button>`  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
-| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType`  |
-+----------------------+------------------------------------------------------------------------------------------------------------------------+
++----------------------+----------------------------------------------------------------------+
+| Rendered as | ``input`` ``submit`` tag |
++----------------------+----------------------------------------------------------------------+
+| Inherited | - `attr`_ |
+| options | - `disabled`_ |
+| | - `label`_ |
+| | - `translation_domain`_ |
++----------------------+----------------------------------------------------------------------+
+| Parent type | :doc:`button</reference/forms/types/button>` |
++----------------------+----------------------------------------------------------------------+
+| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\SubmitType` |
++----------------------+----------------------------------------------------------------------+
 
 Submit buttons feature an additional method
-:method:`Symfony\\Component\\Form\\ClickableInterface\\isClicked` that lets you
+:method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` that lets you
 check whether this button was used to submit the forms. This is especially
 useful when :ref:`a form has multiple submit buttons <book-form-submitting-multiple-buttons>`::