remove one of two empty_data includes
Minimize horizontal scrolling in code blocks (improve readability)
replace Akamaï with Akamai
correct overriden option of button and add checkbox overriden option
correct overriden option of button and add checkbox overriden option
document overriden options of checkbox
document overriden options of choice field
Some additional tweaks and probably some merge conflict fixes
[Security] fix markup
Fix typo: side.bar.twig => sidebar.twig
Add 'in XML' for additional clarity
Applied fixes by @bschussek
Adjust line length
Fix the placement of 'the'.

Add url for 'ask' method.

Adjust horizontal scrolling and line length.
Fix typos, minimize horizontal scrolling
Update form_customization.rst

Minor php code fix - fixes #3520 but in correct branch
Fixed syntax- getEntityManager is deprecated since Symfony 2.1.
minor #3498 Remove second empty data (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

Remove second empty data

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

Commits
-------

b16dcba remove one of two empty_data includes
minor #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic)

This PR was merged into the 2.3 branch.

Discussion
----------

Minimize horizontal scrolling in code blocks (improve readability)

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

Commits
-------

bfd1584 Minimize horizontal scrolling in code blocks (improve readability)
minor #3501 [Security] Fix markup (tyx)

This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix markup

| Q             | A
| ------------- | ---
| Doc fix?      | Yes
| New docs?     | No
| Applies to    | all

Commits
-------

72179cb [Security] fix markup