Merge pull request #3316 from mgrinko/patch-1

Note was added to preferred_choices option of entity field type
[#3316] Slight re-wording
Created consolidated "Access control" section; added warning about routing error pages
Merge pull request #3224 from peterkokot/patch-1

Typos
Merge pull request #3236 from flip111/patch-2

Improvements to registering an extension (#2)
[#3236] minor tweaks
Merge pull request #3318 from willdurand/patch-1

[Components] [ExpressionLanguage] Fix missing quote
Merge branch '2.2' into 2.3

Conflicts:
	cookbook/security/entity_provider.rst
	reference/forms/types/options/disabled.rst.inc
Merge branch '2.3' into 2.4

Conflicts:
	reference/forms/types/integer.rst
	reference/forms/types/number.rst
Removing versionadded 2.1 from merge
Changed wording of roles section

- Changed wording to make it more clear that any one of the required
  roles for a given resource will allow access to that resource.
Fixed typos
Merge branch '2.3' into 2.4
Add additional example for routing integer requirement

This might help for people who are not very good with regular expressions.
Fix getMessage method highlighting
Reformat code block

This will make it more coincide with other code blocks & improve readability.
Fix typo in class name: Appkernel => AppKernel
Fix broken reference link
Rewrite docs
[#3322] Minor tweaks to facelift for console logging entry