document the default value of the form's compound option
add the action option and the method option to the introductionary table, remove doubled include of them
fix the order of the options in the table to match their order below
move versionadded directives for form options directly below the option's headline
remove unnecessary rewrite from nginx conf

It is unnecessary to rewrite to a different URL when you can simply have the request be handled by app.php
fix filename typo in cookbook/form/unit_testing.rst
Updated framework.ide configuration
feature #3835 Updated framework.ide configuration (WouterJ)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #3835).

Discussion
----------

Updated framework.ide configuration

| Q   | A
| --- | ---
| Doc fix? | yes
| New docs? | yes (https://github.com/symfony/symfony/pull/10856)
| Applies to | 2.5/2.6
| Fixed tickets | -

I'll add a versionadded directive when I now the release version.

Commits
-------

15e3ff9 Updated framework.ide configuration
minor #3836 remove unnecessary rewrite from nginx conf (Burgov)

This PR was merged into the 2.3 branch.

Discussion
----------

remove unnecessary rewrite from nginx conf

It is unnecessary to rewrite to a different URL when you can simply have the request be handled by app.php

Commits
-------

0968505 remove unnecessary rewrite from nginx conf
minor #3838 fix filename typo in cookbook/form/unit_testing.rst (hice3000)

This PR was merged into the 2.3 branch.

Discussion
----------

fix filename typo in cookbook/form/unit_testing.rst

Commits
-------

3f956a3 fix filename typo in cookbook/form/unit_testing.rst
minor #3790 [Reference][Forms] move versionadded directives for form options directly below the option's headline (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Reference][Forms] move versionadded directives for form options directly below the option's headline

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

When you link directly to a form type option (for example, http://symfony.com/doc/current/reference/forms/types/form.html#action), the ``versionadded`` directive is rendered outside the user's view port which might confuse people. Thus, @WouterJ and me decided to place ``versionadded`` directives for form type options directly below the option's headline (above the ``type`` line).

Commits
-------

72c30c2 move versionadded directives for form options directly below the option's headline
minor #3789 [Reference][Forms] Improvements to the form type (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Reference][Forms] Improvements to the form type

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

Commits
-------

8a6feb8 fix the order of the options in the table to match their order below
8e7ebf5 add the action option and the method option to the introductionary table, remove doubled include of them
f6a6566 document the default value of the form's compound option
Merge branch '2.3' into 2.4

Conflicts:
	reference/forms/types/options/error_mapping.rst.inc