add note on Symfony SE forks for bug reports
field dependent empty_data option description
[Contributing] extended Symfony 2.4 maintenance

Maintenance for Symfony 2.4 has been extended from July 2014 to
September 2014.
Added July changelog
Added July changelog
Added July changelog
Added a note about the automatic handling of the memory spool in the CLI
minor #4072 [Contributing][Code] add note on Symfony SE forks for bug reports (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Contributing][Code] add note on Symfony SE forks for bug reports

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

As @javiereguiluz stated in symfony/symfony#11494, the way to report bugs can be improved. One of the things that could be done, is to add a note to make a bug reproducable by forking the Symfony Standard Edition with the modifications needed to reproduce a particular issue.

Commits
-------

ebf1415 add note on Symfony SE forks for bug reports
bug #4083 [Reference] field dependent empty_data option description (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Reference] field dependent empty_data option description

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

- [x] choice
- [x] collection
- [x] country
- [x] currency
- [x] email
- [x] entity
- [x] file
- [x] form
- [x] integer
- [x] language
- [x] locale
- [x] money
- [x] number
- [x] password
- [x] percent
- [x] radio
- [x] search
- [x] text
- [x] textarea
- [x] timezone
- [x] url

Replacement of #4033.

Commits
-------

6b61260 field dependent empty_data option description
minor #4101 [Contributing] extended Symfony 2.4 maintenance (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Contributing] extended Symfony 2.4 maintenance

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

Maintenance for Symfony 2.4 has been extended from July 2014 to September 2014 (see [the blog post](http://symfony.com/blog/extended-maintenance-for-symfony-2-4)).

Commits
-------

92c67b5 [Contributing] extended Symfony 2.4 maintenance
Fixed description for session storage
feature #4076 Fixed description of session storage of the ApiKeyAuthenticator (peterrehm)

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

Discussion
----------

Fixed description of session storage of the ApiKeyAuthenticator

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.4
| Fixed tickets | #4060

I assume the authentication is needed for each request (even if token is stored in the session)
since you can add custom logic in the authenticator.

Commits
-------

f3c02dd Fixed description for session storage
minor #4117 Added a note about the automatic handling of the memory spool in the CLI (stof)

This PR was merged into the 2.3 branch.

Discussion
----------

Added a note about the automatic handling of the memory spool in the CLI

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3+
| Fixed tickets | n/a

since https://github.com/symfony/SwiftmailerBundle/pull/64 flushing the memory spool manually is not necessary anymore when using Symfony 2.3+. I added a versionadded note here, but we might decide to remove the obsolete paragraph instead, making the cookbook only about generating urls (which would require renaming the page then)

Commits
-------

c99c70d Added a note about the automatic handling of the memory spool in the CLI
Merge branch '2.3' into 2.4

* 2.3:
  Added a note about the automatic handling of the memory spool in the CLI
  Added July changelog
  [Contributing] extended Symfony 2.4 maintenance
  field dependent empty_data option description
  add note on Symfony SE forks for bug reports

Conflicts:
	changelog.rst
	reference/forms/types/number.rst
Merge branch '2.4' into 2.5

* 2.4:
  Fixed description for session storage
  Added a note about the automatic handling of the memory spool in the CLI
  Added July changelog
  Added July changelog
  [Contributing] extended Symfony 2.4 maintenance
  field dependent empty_data option description
  add note on Symfony SE forks for bug reports

Conflicts:
	changelog.rst
Fixing my bad merge conflict resolution
Merge branch '2.4' into 2.5

* 2.4:
  Fixing my bad merge conflict resolution
Merge branch '2.5'

* 2.5:
  Fixing my bad merge conflict resolution
  Fixed description for session storage
  Added a note about the automatic handling of the memory spool in the CLI
  Added July changelog
  Added July changelog
  Added July changelog
  [Contributing] extended Symfony 2.4 maintenance
  field dependent empty_data option description
  add note on Symfony SE forks for bug reports

Conflicts:
	changelog.rst