Merge pull request #3148 from xabbuh/http-status-code-constants

use verbose HTTP status code constants
Updating Doctrine field types
Adding phpfunction as mentioned by @WouterJ
Wrapping up lines
[#2920] Removing some types not available in 2.2 - will add them to 2.3
Merge branch '2.2' into 2.3
[#2920] Re-adding fields that were available in Doctrine for Symfony 2.3
Merge branch '2.3'

Conflicts:
	book/internals.rst
[Reference][Twig Form Reference] Revert wrong code block fix
[Reference][Twig] Update Twig Extensions description
[Cookbook] Fix toctree order
Fix all lowercase "url" notations to uppercase "URL"
[Reference][Configuration options] Implement consistent headings
Merge pull request #3159 from bicpi/revise_twig_reference

[Reference][Twig] Fix typos and formatting
new fix for Propel docs URLs

looks like previous fix was incomplete
Merge pull request #3152 from xabbuh/issue-2362

document the DateTimeType widget option
Making a sentence slightly more correct by adding the subject
Merge pull request #3166 from bicpi/reorder_cookbook_toctree

[Cookbook] Fix toctree order
Merge branch '2.2' into 2.3

Conflicts:
	cookbook/index.rst
	reference/twig_reference.rst
Merge branch '2.3'