Merge branch '2.7' into 2.8

wouterj · wouterj · commit 1d1ec81e4419 · 2016-02-07T14:02:29.000+01:00
Conflicts:
	changelog.rst
diff --git a/changelog.rst b/changelog.rst
@@ -152,8 +152,8 @@ Minor Documentation Changes
 * `#5989 <https://github.com/symfony/symfony-docs/pull/5989>`_ Fix words according context (richardpq)
 * `#5992 <https://github.com/symfony/symfony-docs/pull/5992>`_ More use single quotes for YAML strings (snoek09)
 * `#5957 <https://github.com/symfony/symfony-docs/pull/5957>`_ mark deep option as deprecated (snoek09)
-* `#5943 <https://github.com/symfony/symfony-docs/pull/5943>`_ Add tip for when returning `null` from `createToken()` (jeroenseegers)
 * `#5940 <https://github.com/symfony/symfony-docs/pull/5940>`_ [Cookbook][ServiceContainer] move filename comment to the top of the code block (xabbuh)
+* `#5943 <https://github.com/symfony/symfony-docs/pull/5943>`_ Add tip for when returning ``null`` from ``createToken()`` (jeroenseegers)
 * `#5956 <https://github.com/symfony/symfony-docs/pull/5956>`_ Update security.rst (mpaquet)
 * `#5959 <https://github.com/symfony/symfony-docs/pull/5959>`_ Fix #5912 Ambiguity on Access Decision Manager's Strategy (Pierre Maraitre)
 * `#5955 <https://github.com/symfony/symfony-docs/pull/5955>`_ use single quotes for YAML strings (snoek09)

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ Minor Documentation Changes`
`152`	`152`	* `#5989 <https://github.com/symfony/symfony-docs/pull/5989>`_ Fix words according context (richardpq)
`153`	`153`	* `#5992 <https://github.com/symfony/symfony-docs/pull/5992>`_ More use single quotes for YAML strings (snoek09)
`154`	`154`	* `#5957 <https://github.com/symfony/symfony-docs/pull/5957>`_ mark deep option as deprecated (snoek09)
`155`		-* `#5943 <https://github.com/symfony/symfony-docs/pull/5943>`_ Add tip for when returning `null` from `createToken()` (jeroenseegers)
`156`	`155`	* `#5940 <https://github.com/symfony/symfony-docs/pull/5940>`_ [Cookbook][ServiceContainer] move filename comment to the top of the code block (xabbuh)
	`156`	+* `#5943 <https://github.com/symfony/symfony-docs/pull/5943>`_ Add tip for when returning ``null`` from ``createToken()`` (jeroenseegers)
`157`	`157`	* `#5956 <https://github.com/symfony/symfony-docs/pull/5956>`_ Update security.rst (mpaquet)
`158`	`158`	* `#5959 <https://github.com/symfony/symfony-docs/pull/5959>`_ Fix #5912 Ambiguity on Access Decision Manager's Strategy (Pierre Maraitre)
`159`	`159`	* `#5955 <https://github.com/symfony/symfony-docs/pull/5955>`_ use single quotes for YAML strings (snoek09)