replace block 'tip' to 'caution
Update components/config/definition.rst
Merge pull request #2256 from WouterJ/security_paths

Used route names for security paths
Merge pull request #2265 from WouterJ/fix_highlighting

[Book] Fixed highlighting issues
[#2265] Slight revert per @Stof
Adding two forgotten use statements to virtual form cookbook page
[#2216] Backporting some missing use statements
Merge branch '2.0' into 2.1

Conflicts:
	book/doctrine.rst
	book/propel.rst
	book/security.rst
	cookbook/form/use_virtuals_forms.rst
Merge pull request #2215 from ricardclau/interpunction_fixes

add some minor interpunction fixes for consistency
Fixed spelling mistake
Rewritten the --prefer-dist tip
Merge branch 'patch-13' of github.com:WouterJ/symfony-docs into WouterJ-patch-13

Conflicts:
	contributing/documentation/overview.rst
Fixed minor format issue
Another typo fix
Merge pull request #2288 from WouterJ/patch-19

Reverted --prefer-dist tip
Merge pull request #2291 from bicpi/fix_typo_in_date_format_form_option

[Typo] Fixing typo in date_format form option description
Merge pull request #2295 from franmomu/patch-1

[Reference] Updated Callback to use interfaces
Update testing.rst

Do not work anymore.
Merge pull request #2305 from hacfi/2.2

Update default exception_controller in TwigBundle Configuration Reference
Fixed a yaml configuration block