improve linking between proxy config sections
fix a headline
fix code block

Indent the complete block with three more spaces so that it is aligned
properly inside the surrounding list item. Move placeholder comment
to the right place.
documentation for the ClassMapGenerator class
[Reference] order form type options alphabetically
minor #4080 [Reference] order form type options alphabetically (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Reference] order form type options alphabetically

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

Commits
-------

99ca7bf [Reference] order form type options alphabetically
Merge branch '2.3' into 2.4

* 2.3:
  [Reference] order form type options alphabetically
Merge branch '2.4' into 2.5

* 2.4:
  [Reference] order form type options alphabetically

Conflicts:
	reference/forms/types/collection.rst
	reference/forms/types/email.rst
	reference/forms/types/file.rst
	reference/forms/types/form.rst
	reference/forms/types/password.rst
	reference/forms/types/search.rst
	reference/forms/types/text.rst
	reference/forms/types/textarea.rst
	reference/forms/types/url.rst
Merge branch '2.5'

* 2.5:
  [Reference] order form type options alphabetically
Update introduction.rst

In my opinion a note or example needs to be added to the command test example to show that the option needs to be prefixed with a double hyphen.
minor #4057 Update introduction.rst (carltondickson)

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

Discussion
----------

Update introduction.rst

In my opinion a note or example needs to be added to the command test example to show that the option name needs to be prefixed with a double hyphen.

Admittedly there is a similar example of passing an option to a command at https://github.com/symfony/symfony-docs/blob/2.4/components/console/introduction.rst#calling-an-existing-command but this could easily be missed.

Commits
-------

ddbadc7 Update introduction.rst
minor #4113 tweaks to the new reverse proxy/load balancer chapter (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

tweaks to the new reverse proxy/load balancer chapter

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

Commits
-------

bbc2f11 fix code block
6943da8 fix a headline
12840b1 improve linking between proxy config sections
feature #4081 [Components][ClassLoader] documentation for the ClassMapGenerator class (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Components][ClassLoader] documentation for the ClassMapGenerator class

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | yes (symfony/symfony#2471)
| Applies to    | all
| Fixed tickets | #1134

Commits
-------

2ebe6c3 documentation for the ClassMapGenerator class
[#4081] Tiny tweak
Changes foobar.net in example.com

As recommanded by the RFC 2606, example.com(/net/org) should be used
as they are reserved for this usage.
minor #4115 [Documentation] [Minor] Changes foobar.net in example.com (magnetik)

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

Discussion
----------

[Documentation] [Minor] Changes foobar.net in example.com

As recommanded by the RFC 2606, example.com(/net/org) should be used
as they are reserved for this usage.

Commits
-------

715c0ed Changes foobar.net in example.com
Merge branch '2.3' into 2.4

* 2.3:
  Changes foobar.net in example.com
  [#4081] Tiny tweak
  Update introduction.rst
  documentation for the ClassMapGenerator class
  fix code block
  fix a headline
  improve linking between proxy config sections
Merge branch '2.4' into 2.5

* 2.4:
  Changes foobar.net in example.com
  [#4081] Tiny tweak
  Update introduction.rst
  documentation for the ClassMapGenerator class
  fix code block
  fix a headline
  improve linking between proxy config sections
Merge branch '2.5'

* 2.5:
  Changes foobar.net in example.com
  [#4081] Tiny tweak
  Update introduction.rst
  documentation for the ClassMapGenerator class
  fix code block
  fix a headline
  improve linking between proxy config sections